diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-25 19:56:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:56:59 +0000 |
| commit | 40b6269a82d974216534c9ac5eaca4f9b29cce6d (patch) | |
| tree | 02f75b0f538111481d0d5c7cc64d75c2f3f5b794 /adb/services.c | |
| parent | c12905b670fa9f1eb98d78334644aa7f8ea50316 (diff) | |
| parent | 0c0ab6bb066a40c781fcd3268db5e6c4d70ffcf6 (diff) | |
| download | system_core-40b6269a82d974216534c9ac5eaca4f9b29cce6d.zip system_core-40b6269a82d974216534c9ac5eaca4f9b29cce6d.tar.gz system_core-40b6269a82d974216534c9ac5eaca4f9b29cce6d.tar.bz2 | |
am 0c0ab6bb: resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp
* commit '0c0ab6bb066a40c781fcd3268db5e6c4d70ffcf6':
Lose insmod/lsmod/rmmod to toybox.
Diffstat (limited to 'adb/services.c')
0 files changed, 0 insertions, 0 deletions