am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations. DO...
am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'c7af4c5c'
* commit 'c7af4c5c':
Import revised translations. DO NOT MERGE