tree 4ee1bf00372b7e1c9a02d5076389e8e38ad3df17
parent 4887e5270b47088f1786b9978c3b338dae8b1e6a
parent 46eb2eb11e43b24dfa0ca0249da6e7797289fe23
author Baligh Uddin <baligh@google.com> 1443029138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443029138 +0000

am 46eb2eb1: (-s ours) Import translations. DO NOT MERGE

* commit '46eb2eb11e43b24dfa0ca0249da6e7797289fe23':
  Import translations. DO NOT MERGE