commit e0e7595f3c5e069e6b85973df6dbba39dcec0984
author Colin Cross <ccross@android.com> Sat Jan 11 23:09:48 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 11 23:09:48 2014 -0800
tree c0f740645f7918b1a657eb9eeeb9a13575d6d590
parent a7083e0dd29aa5102e25c5a978c072b0a2bf94f4
parent e76343ef72458aff8fdc25c57f4e84407c05a2f2

am e76343ef: Merge "Emerson USB ID"

* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index f679a54..cd5885e 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -58,6 +58,8 @@
 #define VENDOR_ID_ECS           0x03fc
 // EMERGING_TECH's USB Vendor ID
 #define VENDOR_ID_EMERGING_TECH 0x297F
+// Emerson's USB Vendor ID
+#define VENDOR_ID_EMERSON       0x2207
 // Foxconn's USB Vendor ID
 #define VENDOR_ID_FOXCONN       0x0489
 // Fujitsu's USB Vendor ID
@@ -192,6 +194,7 @@
     VENDOR_ID_DELL,
     VENDOR_ID_ECS,
     VENDOR_ID_EMERGING_TECH,
+    VENDOR_ID_EMERSON,
     VENDOR_ID_FOXCONN,
     VENDOR_ID_FUJITSU,
     VENDOR_ID_FUNAI,