commit dbf6de9064aed95a2c17f150f537ccfa3fc15b16
author Lorenzo Colitti <lorenzo@google.com> Fri Aug 16 12:13:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 16 12:13:44 2013 -0700
tree b75b88fd944f65616148ea8f541c4afbcf8935dd
parent c9a4c55c915df23b7b08c1b26a107fc922ac6094
parent 3984276ce47c965ad02a522280a139e0a0c7e5cf

am 3984276c: Get rid of an infinite loop in NetlinkEvent.cpp.

* commit '3984276ce47c965ad02a522280a139e0a0c7e5cf':
  Get rid of an infinite loop in NetlinkEvent.cpp.

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