tree 13b8ade6fb3b554b24f1c0b994abc8faacbe2764
parent 3d5fcb7ba8b0fbf3c84aec10accba1ab0895d934
parent c522f9f303b3ac65c9c25e5fae5b5f72ea48dc4e
author Eric Fischer <enf@google.com> 1338573515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338573515 -0700

am c522f9f3: Import translations. DO NOT MERGE

* commit 'c522f9f303b3ac65c9c25e5fae5b5f72ea48dc4e':
  Import translations. DO NOT MERGE