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

* commit 'c121c69b856bfa9baea105439fbdac648d154097': HP USB ID
2014-01-09 18:01:55 +00:00 · 2014-01-09 18:01:55 +00:00 · 3794c96f3e
parent ce1340c665 c121c69b85
commit 3794c96f3e
1 changed files with 3 additions and 0 deletions
--- 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,