am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled...
am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '037bb6c9' into gingerbread-plus-aosp
* commit '037bb6c9':
Fix string placeholders that got mangled in translation. DO NOT MERGE