tree 32dc7bf958845e97f12edfa6cf6f32a665c43e58
parent 5fbd02c3c38ba51590b6f486c3d4025f446cc195
parent 903b56949549d78af56f832bba490659c77d0fa6
author Baligh Uddin <baligh@google.com> 1443030174 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443030174 +0000

am 903b5694: (-s ours) am a8070554: (-s ours) Import translations. DO NOT MERGE

* commit '903b56949549d78af56f832bba490659c77d0fa6':
  Import translations. DO NOT MERGE