tree 8853a0beca525de811333d2127efd369bb3e0e09
parent f40c089612727656584dbb1560cd9dc18bb02cfa
parent cc66509064109eae7f36b47385bf3cdc29e5f661
author Baligh Uddin <baligh@google.com> 1412023311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023311 +0000

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

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