summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-07-18 09:12:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-18 09:12:05 -0700
commit7df080b27921827327952628c46dcea6ae6caf34 (patch)
treefb32509b7d00717563026f44610c66ccc5558a15
parentaf6e3266fd8d4808a3aa2b37e08dce67493ff396 (diff)
parent3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a (diff)
downloadsystem_core-7df080b27921827327952628c46dcea6ae6caf34.zip
system_core-7df080b27921827327952628c46dcea6ae6caf34.tar.gz
system_core-7df080b27921827327952628c46dcea6ae6caf34.tar.bz2
am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"
* commit '3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a': adb: Add USB vendor ID for Lenovo
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 28ba80d..2effb12 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -97,6 +97,8 @@
#define VENDOR_ID_COMPAL 0x1219
// T & A Mobile Phones' USB Vendor ID
#define VENDOR_ID_T_AND_A 0x1BBB
+// Lenovo's USB Vendor ID
+#define VENDOR_ID_LENOVO 0x2006
/** built-in vendor list */
@@ -132,6 +134,7 @@ int builtInVendorIds[] = {
VENDOR_ID_IRIVER,
VENDOR_ID_COMPAL,
VENDOR_ID_T_AND_A,
+ VENDOR_ID_LENOVO,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))