am 11bf335a: (-s ours) am 1a886f80: Merge "Preserve old translations for...
am 11bf335a: (-s ours) am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '11bf335a'
* commit '11bf335a':
Preserve old translations for changed strings. DO NOT MERGE