| commit | 40b6269a82d974216534c9ac5eaca4f9b29cce6d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Nov 25 19:56:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 19:56:59 2014 +0000 |
| tree | 02f75b0f538111481d0d5c7cc64d75c2f3f5b794 | |
| parent | c12905b670fa9f1eb98d78334644aa7f8ea50316 [diff] | |
| parent | 0c0ab6bb066a40c781fcd3268db5e6c4d70ffcf6 [diff] |
am 0c0ab6bb: resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp * commit '0c0ab6bb066a40c781fcd3268db5e6c4d70ffcf6': Lose insmod/lsmod/rmmod to toybox.