tree 92e45165a3379e99c7a8f9f5cfe51dcd07c5087a
parent 57272c14e2da8eb058445aa720b009413221c6c8
parent 3b0e71ebe9159ef01464dc3deda02303b9713bda
author Baligh Uddin <baligh@google.com> 1442632419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632419 +0000

am 3b0e71eb: (-s ours) am c6fce58b: (-s ours) Import translations. DO NOT MERGE

* commit '3b0e71ebe9159ef01464dc3deda02303b9713bda':
  Import translations. DO NOT MERGE