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

Merge commit 'd50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp

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