am f4e74983: (-s ours) am 11c33a7e: Merge "Trim unwanted whitespace from...
am f4e74983: (-s ours) am 11c33a7e: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit 'f4e74983'
* commit 'f4e74983':
Trim unwanted whitespace from translations. DO NOT MERGE