am 8cbaf59e: (-s ours) am 04e5a1cb: Merge "Import revised translations. DO...
am 8cbaf59e: (-s ours) am 04e5a1cb: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '8cbaf59e'
* commit '8cbaf59e':
Import revised translations. DO NOT MERGE