tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent 203a307560ba3dfaeca15df245ab555283746725
parent cfaebbd3d38920f04503e62e5e51239ca76d14d7
author Baligh Uddin <baligh@google.com> 1443538218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538218 +0000

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

* commit 'cfaebbd3d38920f04503e62e5e51239ca76d14d7':
  Import translations. DO NOT MERGE