tree 138f046870f5f5416367522d116392f120537214
parent 97620de6c613bb04e76a4854cf497bd2b6f3d63b
parent 63741a7cc296cab4d65f1eae60d56bf35902eb30
author Baligh Uddin <baligh@google.com> 1443326966 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443326966 +0000

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

* commit '63741a7cc296cab4d65f1eae60d56bf35902eb30':
  Import translations. DO NOT MERGE