| commit | 4aee2e9c80561cc2af931ea2c7c762effc33cf74 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:12:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:35 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 05968288ad89f1f82858044080627b7e49013e0d [diff] | |
| parent | b1a2f9d55dbf6065672edf3a4af7232ff15c5476 [diff] |
am b1a2f9d5: (-s ours) am f6631938: (-s ours) am 77137562: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b1a2f9d55dbf6065672edf3a4af7232ff15c5476':