summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-09 18:06:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-09 18:06:41 +0000
commit4f3c6aed7ba2227c49e28f89d600177cf1d61d83 (patch)
tree2d65b0db3e7f56514a4ac4dba0bedc5576cc097f /adb
parent0a05f002fbc86e4fe410c4efbaf9d720739a21c3 (diff)
parent3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3 (diff)
downloadsystem_core-4f3c6aed7ba2227c49e28f89d600177cf1d61d83.zip
system_core-4f3c6aed7ba2227c49e28f89d600177cf1d61d83.tar.gz
system_core-4f3c6aed7ba2227c49e28f89d600177cf1d61d83.tar.bz2
am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"
* commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3': HP USB ID
Diffstat (limited to 'adb')
-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,