commit 01f7cf79e5bea23fdf966b23558d43566685f284
author Jeff Sharkey <jsharkey@android.com> Wed Aug 14 13:10:33 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 13:10:33 2013 -0700
tree 39bbbbaabaab5f1a087988f30af5fe78e0f12d1f
parent ceaf05faf0b1eacace938fdcc2e40877e0564864
parent 7e64c1436b7693d94d22e45add85c74284c88273

am 7e64c143: Merge "Add legacy layout support to FUSE, enforce write." into klp-dev

* commit '7e64c1436b7693d94d22e45add85c74284c88273':
  Add legacy layout support to FUSE, enforce write.

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