am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"

* commit '0173ebd531b2b443b56d1c12d598f2f89c95fb0a':
  adb: add vendor ID's for Nook, Haier, Hisense, and MTK
This commit is contained in:
Elliott Hughes 2013-06-17 13:54:04 -07:00 committed by Android Git Automerger
commit 1aeefcd690

View file

@ -143,6 +143,14 @@
#define VENDOR_ID_BYD 0x19D1
// OUYA's USB Vendor ID
#define VENDOR_ID_OUYA 0x2836
// Haier's USB Vendor ID
#define VENDOR_ID_HAIER 0x201E
// Hisense's USB Vendor ID
#define VENDOR_ID_HISENSE 0x109b
// MTK's USB Vendor ID
#define VENDOR_ID_MTK 0x0e8d
// B&N Nook's USB Vendor ID
#define VENDOR_ID_NOOK 0x2080
/** built-in vendor list */
@ -201,6 +209,10 @@ int builtInVendorIds[] = {
VENDOR_ID_XIAOMI,
VENDOR_ID_BYD,
VENDOR_ID_OUYA,
VENDOR_ID_HAIER,
VENDOR_ID_HISENSE,
VENDOR_ID_MTK,
VENDOR_ID_NOOK,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))