summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-09 18:01:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-09 18:01:55 +0000
commit3794c96f3e7bb27e56336035bcd7ac643c6869fc (patch)
treeba77b153caaf4cdc98bdd7827ae8d17b9ce68cc5
parentce1340c665e8840c8856898bbfb7ee3b33765359 (diff)
parentc121c69b856bfa9baea105439fbdac648d154097 (diff)
downloadsystem_core-3794c96f3e7bb27e56336035bcd7ac643c6869fc.zip
system_core-3794c96f3e7bb27e56336035bcd7ac643c6869fc.tar.gz
system_core-3794c96f3e7bb27e56336035bcd7ac643c6869fc.tar.bz2
am c121c69b: am b0751101: Merge "HP USB ID"
* commit 'c121c69b856bfa9baea105439fbdac648d154097': HP USB ID
-rwxr-xr-xadb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index df1244f..f679a54 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -78,6 +78,8 @@
#define VENDOR_ID_HARRIS 0x19A5
// Hisense's USB Vendor ID
#define VENDOR_ID_HISENSE 0x109b
+// HP's USB Vendor ID
+#define VENDOR_ID_HP 0x03f0
// HTC's USB Vendor ID
#define VENDOR_ID_HTC 0x0bb4
// Huawei's USB Vendor ID
@@ -200,6 +202,7 @@ int builtInVendorIds[] = {
VENDOR_ID_HAIER,
VENDOR_ID_HARRIS,
VENDOR_ID_HISENSE,
+ VENDOR_ID_HP,
VENDOR_ID_HTC,
VENDOR_ID_HUAWEI,
VENDOR_ID_INQ_MOBILE,