commit 22268c720b53224ed10fa209266418eec964ea7c
author Mike Lockwood <lockwood%android.com@gtempaccount.com> Mon Aug 15 10:29:03 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 15 10:29:03 2011 -0700
tree 9f5194a80fe113ede2a3c30e81487bc970d6ee04
parent 63470fd0271143f88b92360312fd278a20e5765b
parent 549bfcda6df30dd00db254b3717fc8df463ce710

am 549bfcda: am 003771d1: am 80d508fd: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"

* commit '549bfcda6df30dd00db254b3717fc8df463ce710':
  correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 141b32a..e0c6a47 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -97,8 +97,10 @@
 #define VENDOR_ID_COMPAL        0x1219
 // T & A Mobile Phones' USB Vendor ID
 #define VENDOR_ID_T_AND_A       0x1BBB
+// LenovoMobile's USB Vendor ID
+#define VENDOR_ID_LENOVOMOBILE        0x2006
 // Lenovo's USB Vendor ID
-#define VENDOR_ID_LENOVO        0x2006
+#define VENDOR_ID_LENOVO        0x17EF
 // Vizio's USB Vendor ID
 #define VENDOR_ID_VIZIO         0xE040
 
@@ -136,6 +138,7 @@
     VENDOR_ID_IRIVER,
     VENDOR_ID_COMPAL,
     VENDOR_ID_T_AND_A,
+    VENDOR_ID_LENOVOMOBILE,
     VENDOR_ID_LENOVO,
     VENDOR_ID_VIZIO,
 };