commit c9a4c55c915df23b7b08c1b26a107fc922ac6094
author Lorenzo Colitti <lorenzo@google.com> Thu Aug 15 19:26:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 15 19:26:15 2013 -0700
tree 281329278dbaf8e1c82442262a46a6ea177c1b09
parent 516836d4712860fc1e5bd351b4def90550ed07e8
parent 341ed242d400951dd8436cbc988e64c1c075df41

am 341ed242: Merge "Parse IP address changes in NetlinkEvent." into klp-dev

* commit '341ed242d400951dd8436cbc988e64c1c075df41':
  Parse IP address changes in NetlinkEvent.

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]))