tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent f0d79e57349a4f18b61e9a380a19124fb6c8d8fd
parent e0b9a1f72415cdb119356901fd66f5b35115747e
author Baligh Uddin <baligh@google.com> 1383797091 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797091 -0800

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

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