am 96a33bd6: (-s ours) am 30b973b6: Merge "Add tags around string formatting...
am 96a33bd6: (-s ours) am 30b973b6: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
Merge commit '96a33bd6'
* commit '96a33bd6':
Add tags around string formatting placeholders. DO NOT MERGE