| commit | 60f6aa3b38ef467e65a43651d77c8b59cb763efe | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:03:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:03:27 2014 +0000 |
| tree | 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89 | |
| parent | 0e6a9182a95d7e829ca73d68fd2a6b75f05042ea [diff] | |
| parent | c17079e3281ed6fe58a76bbf4394fe9bcf26d9b4 [diff] |
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