am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT...
am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit '097ea0bb'
* commit '097ea0bb':
Import revised translations DO NOT MERGE