tree f7342d2ec5cd31d5bef6650d1ca1f3a035818ba7
parent 6a5eb396d695581d2a8b0e678a037b656ae3e37c
parent fcd3869f7da95200fb4fbc485e77dfd6df5dd186
author Baligh Uddin <baligh@google.com> 1379219968 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379219968 -0700

am fcd3869f: (-s ours) Import translations. DO NOT MERGE

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