am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for...
am aab73757: (-s ours) am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit 'aab73757'
* commit 'aab73757':
Preserve old translations for changed strings. DO NOT MERGE