tree 46bf46a0d76d791337f35b6a4a37b80200c8ea60
parent 0193c6ac625e7abc14ebd625c0d6992aff54c71f
parent 4a27976f0c876e4159bec9dbf3fed0eb49bf60ed
author Jaikumar Ganesh <jaikumar@google.com> 1282163966 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282163966 -0700

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