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