am 007b7002: am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '007b70023b179f846c0ad1f0303da4ce03ac065e':
  Kindle Fire USB ID
This commit is contained in:
Jean-Baptiste Queru 2012-05-02 15:14:04 -07:00 committed by Android Git Automerger
commit 69b2e7dd12

View file

@ -123,6 +123,8 @@
#define VENDOR_ID_INQ_MOBILE 0x2314
// Sony's USB Vendor ID
#define VENDOR_ID_SONY 0x054C
// Lab126's USB Vendor ID
#define VENDOR_ID_LAB126 0x1949
/** built-in vendor list */
int builtInVendorIds[] = {
@ -170,6 +172,7 @@ int builtInVendorIds[] = {
VENDOR_ID_QUANTA,
VENDOR_ID_INQ_MOBILE,
VENDOR_ID_SONY,
VENDOR_ID_LAB126,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))