commit 3042c265bf3123426e99fed856c9d3b7fa3b3ad6
author Elliott Hughes <enh@google.com> Fri Aug 16 15:35:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 16 15:35:05 2013 -0700
tree 4ccef4a807e4832e7df5441818244d120d7faccd
parent cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9
parent b3644d8f6b6485769c7712aaf7749d042aacbc09

am b3644d8f: Merge "Add USB Vendor ID for WACOM"

* commit 'b3644d8f6b6485769c7712aaf7749d042aacbc09':
  Add USB Vendor ID for WACOM

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 93dda5d..4c0eec5 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -157,7 +157,8 @@
 #define VENDOR_ID_ECS           0x03fc
 // MSI's USB Vendor ID
 #define VENDOR_ID_MSI           0x1462
-
+// Wacom's USB Vendor ID
+#define VENDOR_ID_WACOM         0x0531
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -222,6 +223,7 @@
     VENDOR_ID_QISDA,
     VENDOR_ID_ECS,
     VENDOR_ID_MSI,
+    VENDOR_ID_WACOM,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))