tree e7d25b34455a7b93eb92fa3a3ab1c21c2f3c2d34
parent e05df90d3e5734f7a0e4aacfeef2cbdcc3df9650
parent 8462ebf7d9297ffc5639696a44ce39c4065d903b
author Baligh Uddin <baligh@google.com> 1408141202 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408141202 +0000

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

* commit '8462ebf7d9297ffc5639696a44ce39c4065d903b':
  Import translations. DO NOT MERGE