am 54e21852: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp

* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
  Trim unwanted whitespace from translations.  DO NOT MERGE