diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-05-15 10:44:29 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-05-15 10:44:29 -0700 |
| commit | c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690 (patch) | |
| tree | 4236447a8b41fb64ec1e52b71209c6fab5c47e2d /adb | |
| parent | 9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3 (diff) | |
| parent | 246808bedfb35ce8abd6cee434ff5b07a6618e8a (diff) | |
| download | system_core-c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690.tar.gz system_core-c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690.tar.bz2 system_core-c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690.zip | |
resolved conflicts for merge of 246808be to jb-dev-plus-aosp
Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
Diffstat (limited to 'adb')
| -rw-r--r-- | 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 f5aa8cc1..b9881152 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -125,6 +125,8 @@ #define VENDOR_ID_SONY 0x054C // Lab126's USB Vendor ID #define VENDOR_ID_LAB126 0x1949 +// Yulong Coolpad's USB Vendor ID +#define VENDOR_ID_YULONG_COOLPAD 0x1EBF /** built-in vendor list */ int builtInVendorIds[] = { @@ -173,6 +175,7 @@ int builtInVendorIds[] = { VENDOR_ID_INQ_MOBILE, VENDOR_ID_SONY, VENDOR_ID_LAB126, + VENDOR_ID_YULONG_COOLPAD, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |