am 307f0c17: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '307f0c17b7f6624ee005db5fe2f99c640cf83916' into gingerbread-plus-aosp

* commit '307f0c17b7f6624ee005db5fe2f99c640cf83916':
  Trim unwanted whitespace from translations.  DO NOT MERGE