tree a8ff93c42fb45597ef036e11858677c9666692e2
parent 0b4c28498d00012c161d4af8943fad4e3ff8aca5
parent b118f139f411a7be2296a86a411784a24fdc72dd
author Kenny Root <kroot@google.com> 1274129624 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274129624 -0700

am 8ea405d1: am cfa2de30: Import revised translations

Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken

* commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a':
  Import revised translations