tree 9ed9e3003af11d83b831de43355861eeea5695e6
parent a7b294057a5ec8f72e8f261ab00960565e4efd3b
parent f8a49f869d6d0303998e8483ca7f650a0d4e5963
author Baligh Uddin <baligh@google.com> 1349927753 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349927753 -0700

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

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