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

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

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