tree d186d50b02d9f67035af2053787977efc7a08742
parent f1a56578ee1bff044114bd106d4a76ea24c8cec3
parent b53127def7b7a6103f55f3f1dca81546dea36ef9
author Eric Fischer <enf@google.com> 1318962845 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318962845 -0700

am b53127de: (-s ours) am a359cef5: (-s ours) Import revised translations.  DO NOT MERGE

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