tree 69a45961f1d0bec484fc136132130ba9d594db18
parent 91ee5e7f14ac3ca016753e3bf0b50f187fcb5b69
parent c33b83a65c5a367ff596ec1035fdc2245c8ec6e8
author Baligh Uddin <baligh@google.com> 1410886234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886234 +0000

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

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