tree eea6abc90fa8aac731d395ac653fbc30b47af1b4
parent 7ba188d3756c947cfeb681d4bc85f2b43717e390
parent ce2c64f87a7eb8bd495e3b6a20f20fa5d275059c
author Baligh Uddin <baligh@google.com> 1408985600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408985600 +0000

am ce2c64f8: (-s ours) am 7940a364: (-s ours) am c78c4524: (-s ours) Import translations. DO NOT MERGE

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