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