commit b10fb88e1ea02bce8c052d51662fe2c6fd00f275
author Colin Cross <ccross@android.com> Thu Jun 19 15:48:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 19 15:48:25 2014 +0000
tree 6a2239fcd97ad632c226d254d12d77fc0fc7db7b
parent bb8aec417531010eadc27bdfed0c19fc5f669fbc
parent d7d9b6fcaa415ea6251e45d84b95a95740ea807e

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

* commit 'd7d9b6fcaa415ea6251e45d84b95a95740ea807e':
  adb: Add USB vendor ID for Honeywell

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 705f02b..e7d8268 100755
--- 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 @@
     VENDOR_ID_HAIER,
     VENDOR_ID_HARRIS,
     VENDOR_ID_HISENSE,
+    VENDOR_ID_HONEYWELL,
     VENDOR_ID_HP,
     VENDOR_ID_HTC,
     VENDOR_ID_HUAWEI,