tree c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5
parent 6c8e9296c35ec88b5093d4f5553252ee0f244141
parent c2c527a6f4b3629ea271ef5444292a02e2d9a17e
author Baligh Uddin <baligh@google.com> 1398218893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398218893 +0000

am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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