commit 3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3
author Colin Cross <ccross@android.com> Thu Jan 09 18:04:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 09 18:04:17 2014 +0000
tree 3a46daf66665b3085da875facb9604f18ad3d3b5
parent 4082bf8c963dbd44fe2f6367fa687217cbac58d3
parent 3794c96f3e7bb27e56336035bcd7ac643c6869fc

am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"

* commit '3794c96f3e7bb27e56336035bcd7ac643c6869fc':
  HP USB ID

adb/usb_vendors.c

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 @@
     VENDOR_ID_HAIER,
     VENDOR_ID_HARRIS,
     VENDOR_ID_HISENSE,
+    VENDOR_ID_HP,
     VENDOR_ID_HTC,
     VENDOR_ID_HUAWEI,
     VENDOR_ID_INQ_MOBILE,