tree 9ed9e3003af11d83b831de43355861eeea5695e6
parent a2e9f101bd2369d4d344d04c317882d1ef90058c
parent db983fa7c46da75469d0042425b41f84b5cdc9ac
author Baligh Uddin <baligh@google.com> 1349927914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349927914 -0700

am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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