am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

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