summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-08-28 08:37:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-28 08:37:02 -0700
commitb92649341718984bf91a09a3e9dddf04b844c567 (patch)
tree731b81cf45290fa50b91d81c8d9ea04bb31d3995
parent9fe7014d056ac6478069d6f2e946ddbe2863d576 (diff)
parent876f436668036e8e9d3f86434eee1a44ff5364b8 (diff)
downloadsystem_core-b92649341718984bf91a09a3e9dddf04b844c567.zip
system_core-b92649341718984bf91a09a3e9dddf04b844c567.tar.gz
system_core-b92649341718984bf91a09a3e9dddf04b844c567.tar.bz2
am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."
* commit '876f436668036e8e9d3f86434eee1a44ff5364b8': correct msi usb vendor id.
-rw-r--r--adb/usb_vendors.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 4c0eec5..19b3022 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -156,7 +156,7 @@
// ECS's USB Vendor ID
#define VENDOR_ID_ECS 0x03fc
// MSI's USB Vendor ID
-#define VENDOR_ID_MSI 0x1462
+#define VENDOR_ID_MSI 0x0DB0
// Wacom's USB Vendor ID
#define VENDOR_ID_WACOM 0x0531