tree 4ee1bf00372b7e1c9a02d5076389e8e38ad3df17
parent 6db1aec72896c6b912e20d32ad55f83420915e00
parent 946371f8314ae0578a3559a956343ea9dbd77bf1
author Baligh Uddin <baligh@google.com> 1443150807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150807 +0000

am 946371f8: (-s ours) Import translations. DO NOT MERGE

* commit '946371f8314ae0578a3559a956343ea9dbd77bf1':
  Import translations. DO NOT MERGE