am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"

* commit 'f02fd9f0b061d29bb872664479ed4a5949d23ac9': adb: Add USB vendor ID for Honeywell
2014-06-19 15:44:14 +00:00 · 2014-06-19 15:44:14 +00:00 · d7d9b6fcaa
parent 08c704a0fe f02fd9f0b0
commit d7d9b6fcaa
1 changed files with 3 additions and 0 deletions
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@ -84,6 +84,8 @@
 #define VENDOR_ID_HARRIS        0x19A5
 // Hisense's USB Vendor ID
 #define VENDOR_ID_HISENSE       0x109b
+// Honeywell's USB Vendor ID
+#define VENDOR_ID_HONEYWELL     0x0c2e
 // HP's USB Vendor ID
 #define VENDOR_ID_HP            0x03f0
 // HTC's USB Vendor ID
@ -217,6 +219,7 @@ int builtInVendorIds[] = {
    VENDOR_ID_HAIER,
    VENDOR_ID_HARRIS,
    VENDOR_ID_HISENSE,
+    VENDOR_ID_HONEYWELL,
    VENDOR_ID_HP,
    VENDOR_ID_HTC,
    VENDOR_ID_HUAWEI,