tree 61b373ac28947229e10b8fd6eec07978d9450a73
parent 05a6596d107e6205aef5aece5e1f39b841efe36b
parent 60b560def10490b9e55dbce4412bd240a9a77816
author Baligh Uddin <baligh@google.com> 1400725919 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400725919 +0000

am 1ab8077b: (-s ours) am 0eb7fdec: (-s ours) Import translations. DO NOT MERGE

* commit '1ab8077bf6cae2303c4ed3a9e0c76f65047e899f':
  Import translations. DO NOT MERGE