tree 114fbd18af676cd735e27e46e5efcf05637ad0a0
parent 4f00fc7d0347b785821e7bb97006c33a860864e4
parent 966b35006b2865b50bb7cc880cc5eb9f26c27a36
author Baligh Uddin <baligh@google.com> 1413757025 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757025 +0000

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

* commit '966b35006b2865b50bb7cc880cc5eb9f26c27a36':
  Import translations. DO NOT MERGE