tree 4123a9a062cde342deb62b522774674ef3bce03a
parent ed459a8f55ba1b09c728d324802cc9816e729687
parent 5fe0d63fe8c2a0317b7d1266394748275648bb33
author Baligh Uddin <baligh@google.com> 1413757024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757024 +0000

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

* commit '5fe0d63fe8c2a0317b7d1266394748275648bb33':
  Import translations. DO NOT MERGE