| commit | 1bddfbbaa79960c353a6115f18105e5ef697d0fa | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:03:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:03:51 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | ee63d2f184c688e3be6305e376842aff495911a7 [diff] | |
| parent | 923950d1ea4472d490f449884383705ccafe0fe4 [diff] |
am 923950d1: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '923950d1ea4472d490f449884383705ccafe0fe4': Import translations. DO NOT MERGE