am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO...
am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f2af2d92'
* commit 'f2af2d92':
Import revised translations. DO NOT MERGE