am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from...
am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '7063eb10'
* commit '7063eb10':
Trim unwanted whitespace from translations. DO NOT MERGE