tree ba34f75d66b127928f20954281f7482eada21428
parent d560e24e8edf8251a3756400ce5f75bcfdd51b9a
parent 24bd050ecbf61f7b0806801ed70d6a972f0f2a7f
author Eric Fischer <enf@google.com> 1338573752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338573752 -0700

am 24bd050e: Import translations. DO NOT MERGE

* commit '24bd050ecbf61f7b0806801ed70d6a972f0f2a7f':
  Import translations. DO NOT MERGE