tree 383bfb90e1940881c4f125f4b595ef1d2ad44e5a
parent e424b26d46a821d151d88724b6b6d6afc8de4317
parent 5054aebdd945d95ea59d4d7e2e430d29fc4642c7
author Baligh Uddin <baligh@google.com> 1410882021 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410882021 +0000

am 5054aebd: (-s ours) Import translations. DO NOT MERGE

* commit '5054aebdd945d95ea59d4d7e2e430d29fc4642c7':
  Import translations. DO NOT MERGE