tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent 0e6a9182a95d7e829ca73d68fd2a6b75f05042ea
parent c17079e3281ed6fe58a76bbf4394fe9bcf26d9b4
author Baligh Uddin <baligh@google.com> 1411581807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411581807 +0000

am c17079e3: (-s ours) am 81295a0e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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