summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-18 11:35:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-18 11:35:46 -0700
commit98c02528a2f8bdc0f31a78a8b0b086f4ae823310 (patch)
tree5c1831ddbd83c8feac3f952dcc1b4b578d86df02
parent44d1f3c703015b065f009604907033aac8bedf32 (diff)
parent19188955b50ef6cb133780f66384e9fa055acfac (diff)
downloadsystem_core-98c02528a2f8bdc0f31a78a8b0b086f4ae823310.zip
system_core-98c02528a2f8bdc0f31a78a8b0b086f4ae823310.tar.gz
system_core-98c02528a2f8bdc0f31a78a8b0b086f4ae823310.tar.bz2
am 19188955: am d92e35eb: Merge "Add Qisda usb config"
* commit '19188955b50ef6cb133780f66384e9fa055acfac': Add Qisda usb config
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index ed53abc..e132c67 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -151,6 +151,8 @@
#define VENDOR_ID_MTK 0x0e8d
// B&N Nook's USB Vendor ID
#define VENDOR_ID_NOOK 0x2080
+// Qisda's USB Vendor ID
+#define VENDOR_ID_QISDA 0x1D45
/** built-in vendor list */
@@ -213,6 +215,7 @@ int builtInVendorIds[] = {
VENDOR_ID_HISENSE,
VENDOR_ID_MTK,
VENDOR_ID_NOOK,
+ VENDOR_ID_QISDA,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))