am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"

* commit '1f72fe991dc2e48c13518015c523f9e3ea048af2':
  adb: Add USB vendor ID for Lenovo
This commit is contained in:
Mike Lockwood 2011-07-18 09:18:58 -07:00 committed by Android Git Automerger
commit 01acea1125

View file

@ -97,6 +97,8 @@
#define VENDOR_ID_COMPAL 0x1219 #define VENDOR_ID_COMPAL 0x1219
// T & A Mobile Phones' USB Vendor ID // T & A Mobile Phones' USB Vendor ID
#define VENDOR_ID_T_AND_A 0x1BBB #define VENDOR_ID_T_AND_A 0x1BBB
// Lenovo's USB Vendor ID
#define VENDOR_ID_LENOVO 0x2006
/** built-in vendor list */ /** built-in vendor list */
@ -132,6 +134,7 @@ int builtInVendorIds[] = {
VENDOR_ID_IRIVER, VENDOR_ID_IRIVER,
VENDOR_ID_COMPAL, VENDOR_ID_COMPAL,
VENDOR_ID_T_AND_A, VENDOR_ID_T_AND_A,
VENDOR_ID_LENOVO,
}; };
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))