tree 5f157d0ef9e984d2a1d6c30be79519592100a16f
parent 6fa00b3705e858d98daff9a5a5bdad67b111aff8
parent 627a0b9ce9a899622575fd11e3295b5de84d6c19
author Eric Fischer <enf@google.com> 1305144532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305144532 -0700

am 627a0b9c: (-s ours) am b2948b04: am c952aaef: Import revised translations.  DO NOT MERGE

* commit '627a0b9ce9a899622575fd11e3295b5de84d6c19':
  Import revised translations.  DO NOT MERGE