tree 6e77daa16f93b81cb150ca408ca98f36b112cccc
parent aae2993228c418f2d9a6472db50120b1bc876768
parent 077cf819888f39712a657300f197d4b74a8b024c
author Eric Fischer <enf@google.com> 1328897294 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897294 -0800

am 077cf819: Import translations. DO NOT MERGE

* commit '077cf819888f39712a657300f197d4b74a8b024c':
  Import translations. DO NOT MERGE