tree b31b67779652a64f0b55063501fc6029632807d7
parent e53ad9ba39c2bf9ddedd2dfbc775eb43658fef6a
parent 2d25a6375973c5f49eccfa4228bd3eb6620709b1
author Baligh Uddin <baligh@google.com> 1404670698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404670698 +0000

am 2d25a637: (-s ours) Import translations. DO NOT MERGE

* commit '2d25a6375973c5f49eccfa4228bd3eb6620709b1':
  Import translations. DO NOT MERGE