tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent 60f6aa3b38ef467e65a43651d77c8b59cb763efe
parent b16f6dadb21cb8ec6f86680058c0669aaa68eb4a
author Baligh Uddin <baligh@google.com> 1411582612 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411582612 +0000

am b16f6dad: (-s ours) am 87772f1f: (-s ours) am db330a39: (-s ours) Import translations. DO NOT MERGE

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