diff options
| author | Colin Cross <ccross@android.com> | 2014-01-12 07:20:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-12 07:20:13 +0000 |
| commit | ccfa8988bbff5531c6d131ee25ae0881d6e05f2f (patch) | |
| tree | 4e080dc79fc9f21ae3be6682bb9abd232ee3e9fb /adb | |
| parent | 6e9c19906a86ad500dbb46c9e5c93b14bba1ece9 (diff) | |
| parent | 6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc (diff) | |
| download | system_core-ccfa8988bbff5531c6d131ee25ae0881d6e05f2f.zip system_core-ccfa8988bbff5531c6d131ee25ae0881d6e05f2f.tar.gz system_core-ccfa8988bbff5531c6d131ee25ae0881d6e05f2f.tar.bz2 | |
am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"
* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc':
Emerson USB ID
Diffstat (limited to 'adb')
| -rwxr-xr-x | adb/usb_vendors.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index f679a54..cd5885e 100755 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -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, |