tree 6e77daa16f93b81cb150ca408ca98f36b112cccc
parent 394b57e4cc6fb93ef7238da8002d3aa0d1dcac3f
parent bb5aa4877882c502ac4db7a35fc685b63dafb157
author Eric Fischer <enf@google.com> 1328897453 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897453 -0800

am bb5aa487: am 077cf819: Import translations. DO NOT MERGE

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