tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent d68f6f49f0b9c8866325a555e8cfbb2c63dbb828
parent 6670a5793193164f3f39388784779963c034ca08
author Baligh Uddin <baligh@google.com> 1383317932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383317932 -0700

am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE

* commit '6670a5793193164f3f39388784779963c034ca08':
  Import translations. DO NOT MERGE