tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent 864a1a6af4e227bd89aebee24e829c77c8cd89e4
parent a2b359cd08575edcb7845511ae24f731b52418a9
author Baligh Uddin <baligh@google.com> 1403801676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403801676 +0000

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

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