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