am 60218f19: Merge "Add gionee USB vendor id."

* commit '60218f19c94a12ab38444dc598cbb8f8db1f72ca':
  Add gionee USB vendor id.
This commit is contained in:
Elliott Hughes 2014-06-16 17:36:48 +00:00 committed by Android Git Automerger
commit 6c65cd5db8

View file

@ -74,6 +74,8 @@
#define VENDOR_ID_GIGABYTE 0x0414 #define VENDOR_ID_GIGABYTE 0x0414
// Gigaset's USB Vendor ID // Gigaset's USB Vendor ID
#define VENDOR_ID_GIGASET 0x1E85 #define VENDOR_ID_GIGASET 0x1E85
// GIONEE's USB Vendor ID
#define VENDOR_ID_GIONEE 0x271D
// Google's USB Vendor ID // Google's USB Vendor ID
#define VENDOR_ID_GOOGLE 0x18d1 #define VENDOR_ID_GOOGLE 0x18d1
// Haier's USB Vendor ID // Haier's USB Vendor ID
@ -210,6 +212,7 @@ int builtInVendorIds[] = {
VENDOR_ID_GARMIN_ASUS, VENDOR_ID_GARMIN_ASUS,
VENDOR_ID_GIGABYTE, VENDOR_ID_GIGABYTE,
VENDOR_ID_GIGASET, VENDOR_ID_GIGASET,
VENDOR_ID_GIONEE,
VENDOR_ID_GOOGLE, VENDOR_ID_GOOGLE,
VENDOR_ID_HAIER, VENDOR_ID_HAIER,
VENDOR_ID_HARRIS, VENDOR_ID_HARRIS,