tree 3dcc214093e40f0aeabf4662f5baf7e535258493
parent 1425f22853e00d8f0cdb33ce97a84c6cf677e8da
parent 8e773d9ee3880b989e2d55d9e3cab3a3fbe8b396
author Baligh Uddin <baligh@google.com> 1443149957 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443149957 +0000

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

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