am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'c3a785cbc63e9947f5aec868fafe708e7a8b6731':
  Import revised translations.  DO NOT MERGE