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