am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0':
  Emerson USB ID
This commit is contained in:
Colin Cross 2014-01-12 07:16:38 +00:00 committed by Android Git Automerger
commit 6f8ddbbbe8

View file

@ -58,6 +58,8 @@
#define VENDOR_ID_ECS 0x03fc
// EMERGING_TECH's USB Vendor ID
#define VENDOR_ID_EMERGING_TECH 0x297F
// Emerson's USB Vendor ID
#define VENDOR_ID_EMERSON 0x2207
// Foxconn's USB Vendor ID
#define VENDOR_ID_FOXCONN 0x0489
// Fujitsu's USB Vendor ID
@ -192,6 +194,7 @@ int builtInVendorIds[] = {
VENDOR_ID_DELL,
VENDOR_ID_ECS,
VENDOR_ID_EMERGING_TECH,
VENDOR_ID_EMERSON,
VENDOR_ID_FOXCONN,
VENDOR_ID_FUJITSU,
VENDOR_ID_FUNAI,