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

Merge commit 'e07bc39a3b3e15b35ff4f3abe37143d93b27f264' into gingerbread-plus-aosp

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