commit c121c69b856bfa9baea105439fbdac648d154097
author Colin Cross <ccross@android.com> Thu Jan 09 09:59:30 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 09 09:59:30 2014 -0800
tree 1069eb27bb861f452511222a9a3d60dbbdffb3b7
parent 5a3696297b2f8d463ba601772df7af5966321d2e
parent b0751101b090a8732c62ad261fa44e5d6a69a2cc

am b0751101: Merge "HP USB ID"

* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
  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,