am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO...
am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'cfba8c03'
* commit 'cfba8c03':
Import revised translations. DO NOT MERGE