commit | f4a273ccb9ffd9db60d870b6a0d92e7d6ff7e267 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:22:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:22:23 2014 +0000 |
tree | 5fc024fbda4e9816cbf71f5bb0d9ae4ecb6fc6d2 | |
parent | fcfff5d45c25fbbbb19138cc7ea62f6290feafe4 [diff] | |
parent | ee63d2f184c688e3be6305e376842aff495911a7 [diff] |
am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ee63d2f184c688e3be6305e376842aff495911a7': Import translations. DO NOT MERGE