commit 3f17bda89498509fd56c3578ebff51ec0c2fb33f
author Todd Poynor <toddpoynor@google.com> Mon Aug 12 12:22:07 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 12 12:22:07 2013 -0700
tree 700946877a872ab8b95d6c56dc355a18fd385330
parent 49f2e1cedfcf1dac72efe6e3634a3cd2db299e30
parent a41611f638f82cb8066f83b32f2610f0d00dafc6

am a41611f6: healthd: fix botched logging call

* commit 'a41611f638f82cb8066f83b32f2610f0d00dafc6':
  healthd: fix botched logging call

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