tree 51ed7a181d226f0dc83e4139371c1b04e4333f26
parent 1142274c262209472051fa5a28b59b3b873649d9
parent 9abd7db04aed90d4a9b1391fff8f154a99e0d199
author Baligh Uddin <baligh@google.com> 1399996983 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399996983 +0000

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

* commit '9abd7db04aed90d4a9b1391fff8f154a99e0d199':
  Import translations. DO NOT MERGE