tree 0beb1cbd024ce6251eaf557c4fb9a7f43499ff2e
parent d4693ca99284a12703a0de9fd6c70f50262073e0
parent 037bb6c989f4bbce24585abcca790fdc3115ff14
author Eric Fischer <enf@google.com> 1284074406 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284074406 -0700

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

Merge commit '037bb6c989f4bbce24585abcca790fdc3115ff14' into gingerbread-plus-aosp

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