tree 8200d156c1da992119b6e757eae28867b070b9f2
parent bfb9f78a9b502c835d056817dfe303f77ca4a6b5
parent b3f4b48ec734146650f0755c8143aaebd487118b
author Baligh Uddin <baligh@google.com> 1368204424 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368204424 -0700

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

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