tree a6acb532ab5c0ef0bc7ea8d9546148387cd2683c
parent ed11a21831c0005af092d856a8a1631fbfb98b2b
parent 553ced659c99dbba81c1d5ab3ab1c176920d84b7
author Jaikumar Ganesh <jaikumar@google.com> 1282164195 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282164195 -0700

am 553ced65: (-s ours) am 4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread

Merge commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7'

* commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7':
  Add tags around string formatting placeholders. DO NOT MERGE