commit 49f2e1cedfcf1dac72efe6e3634a3cd2db299e30
author Elliott Hughes <enh@google.com> Mon Aug 12 10:34:58 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 12 10:34:58 2013 -0700
tree 2a14952ee819997219b2e6affba2eb5708c327be
parent 57fd0989cbb59f305514378e511e36c752b5aa20
parent cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9

am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit 'cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9':
  Add USB Vendor ID for MSI

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 68bb232..93dda5d 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -155,6 +155,8 @@
 #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
 
 
 /** built-in vendor list */
@@ -219,6 +221,7 @@
     VENDOR_ID_NOOK,
     VENDOR_ID_QISDA,
     VENDOR_ID_ECS,
+    VENDOR_ID_MSI,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))