tree 65659ea5cfb72a29c9dd304bbc754078c2b689bc
parent efaf8a3dcde8158f50e5db36a7e81207b9978863
parent 591f23a6aff66d452e34e6aed6a164028d9326bd
author Baligh Uddin <baligh@google.com> 1400164435 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400164435 +0000

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

* commit '591f23a6aff66d452e34e6aed6a164028d9326bd':
  Import translations. DO NOT MERGE