am 1a886f80: Merge "Preserve old translations for changed strings.  DO NOT MERGE" into gingerbread

Merge commit '1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp

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