tree 7f7e31c000c122338b27efc695fe71f5b3cd454c
parent 5bba4287c5bcdb1b326a7e65ce4a7a46bf861ba7
parent c7001409187b6c98de2524a8eab8e177011fcc03
author Baligh Uddin <baligh@google.com> 1403552467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403552467 +0000

am c7001409: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'c7001409187b6c98de2524a8eab8e177011fcc03':
  Import translations. DO NOT MERGE