am 4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread

Merge commit '4a27976f0c876e4159bec9dbf3fed0eb49bf60ed' into gingerbread-plus-aosp

* commit '4a27976f0c876e4159bec9dbf3fed0eb49bf60ed':
  Add tags around string formatting placeholders. DO NOT MERGE