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

Merge commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463'

* commit 'aab7375799e76ec2e429fbd8224d0c6e8cc96463':
  Preserve old translations for changed strings.  DO NOT MERGE