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