am 2d68f1b5: (-s ours) am 54e21852: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d'

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