commit bd442a74ecd6a03fb623d32fcac47a5ff85789be
author Jeff Brown <jeffbrown@google.com> Mon Aug 19 17:01:27 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 19 17:01:27 2013 -0700
tree 265eb2ad5b22b0ba138195b818b8ebf8353f4354
parent 3c0eef67f7e6385710d69bda40e50b23fa91c081
parent c7a4f74dad2b91bebad608618f3fda434563be74

am c7a4f74d: Merge "Add helpers for audio remote submix devices." into klp-dev

* commit 'c7a4f74dad2b91bebad608618f3fda434563be74':
  Add helpers for audio remote submix devices.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 68bb232..4c0eec5 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -155,7 +155,10 @@
 #define VENDOR_ID_QISDA         0x1D45
 // ECS's USB Vendor ID
 #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[] = {
@@ -219,6 +222,8 @@
     VENDOR_ID_NOOK,
     VENDOR_ID_QISDA,
     VENDOR_ID_ECS,
+    VENDOR_ID_MSI,
+    VENDOR_ID_WACOM,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))