| commit | 876f436668036e8e9d3f86434eee1a44ff5364b8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 28 08:35:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 28 08:35:16 2013 -0700 |
| tree | 535e071f3d0d6f4cf2936d903d7c39e7c2473af0 | |
| parent | bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c [diff] | |
| parent | a7f6e015a5cf2ac85549fe676d6641caf6af1291 [diff] |
am a7f6e015: Merge "correct msi usb vendor id." * commit 'a7f6e015a5cf2ac85549fe676d6641caf6af1291': correct msi usb vendor id.
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