tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 6670a5793193164f3f39388784779963c034ca08
parent 322554a0a54c6f9160181a46b37e7914373115a8
author Baligh Uddin <baligh@google.com> 1383797229 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797229 -0800

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

* commit '322554a0a54c6f9160181a46b37e7914373115a8':
  Import translations. DO NOT MERGE