tree 6506ca86faa04cbd997e679ec0d878d6e35543f2
parent 587cf52babf1b9767cf13ec87167c2c91df0e3b1
parent bfb9f78a9b502c835d056817dfe303f77ca4a6b5
author Baligh Uddin <baligh@google.com> 1368204548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368204548 -0700

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

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