| commit | ecbd957512702f8d713c44a47dd7ff6c46d6dc14 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Nov 21 22:32:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 22:32:49 2014 +0000 |
| tree | 1bdef3faf448618a8f4c98037398f4d74df3f594 | |
| parent | 43cc5c2d75b9166b42bdb18a47eff7b59a50c5cc [diff] | |
| parent | f799fac2437987c9785805912931e6b90f15fa6b [diff] |
am f799fac2: resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aosp * commit 'f799fac2437987c9785805912931e6b90f15fa6b': Remove the adb usb vendor id whitelist.