tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent d7293b2748f7caad718a68de4fd7ff4aa356b4b9
parent 8ccffb8253df55a6561e64c6bc6eb3dff5b49066
author Baligh Uddin <baligh@google.com> 1411322701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411322701 +0000

am 8ccffb82: (-s ours) am 64098177: (-s ours) Import translations. DO NOT MERGE

* commit '8ccffb8253df55a6561e64c6bc6eb3dff5b49066':
  Import translations. DO NOT MERGE