tree 9c52b7cce9b8088cd19651005a5a187afc88301b
parent a8f37bb8f670057cbe7401e56a9d2855dc0accd4
parent bc86227c130ef77b67a08eca4c92181ee2184e95
author Baligh Uddin <baligh@google.com> 1383714179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383714179 -0800

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

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