commit 699249f9e4f8f5db6e798420fb1b5c6d2e16d42d
author Jesse Hall <jessehall@google.com> Fri Aug 16 14:53:50 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 16 14:53:50 2013 -0700
tree c157db804f9011fbf275f291f2abafe5570c8b4a
parent dbf6de9064aed95a2c17f150f537ccfa3fc15b16
parent 08380deb247865b862f7f284c80eeea4f5ec38f6

am 08380deb: Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev

* commit '08380deb247865b862f7f284c80eeea4f5ec38f6':
  Replace sRGB_888 with sRGB_X_8888

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