| commit | e7aa5baef02ac3d30b013a6614231150771747b4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 28 08:39:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 28 08:39:05 2013 -0700 |
| tree | 9eddb92efeab1dd4748f1805ca5e0b8fa5a77681 | |
| parent | 9950f549d6de8cd312d1c9ee4ecc40388f77f857 [diff] | |
| parent | b92649341718984bf91a09a3e9dddf04b844c567 [diff] |
am b9264934: am 876f4366: am a7f6e015: Merge "correct msi usb vendor id." * commit 'b92649341718984bf91a09a3e9dddf04b844c567': 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