tree f06cac7a85ff20d2f41cfb9e2412cc9f7f98ec12
parent 0fd720422f69837c3c121c2debeac71794d27e30
parent 0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e
author Eric Fischer <enf@google.com> 1284074618 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284074618 -0700

am 0aabafe3: (-s ours) am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation.  DO NOT MERGE

Merge commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'

* commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE