summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:31:57 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-15 11:31:57 -0700
commit2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d (patch)
treed25e56189054be79ff2fa699502a6a806a3c9d1a
parentee0306b93386340c86d6ca9f70bd147fba16d901 (diff)
parent83cb93b4016cbd6029a2d215a7b63fa716b103e4 (diff)
downloadsystem_core-2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d.zip
system_core-2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d.tar.gz
system_core-2ef569417d1136f9dcb8c2bbc6e3c3c59c4ea28d.tar.bz2
merge from open-source master
Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f
-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 e9e14da..db8b018 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -69,6 +69,8 @@
#define VENDOR_ID_PANTECH 0x10A9
// Qualcomm's USB Vendor ID
#define VENDOR_ID_QUALCOMM 0x05c6
+// On-The-Go-Video's USB Vendor ID
+#define VENDOR_ID_OTGV 0x2257
/** built-in vendor list */
@@ -90,6 +92,7 @@ int builtInVendorIds[] = {
VENDOR_ID_KYOCERA,
VENDOR_ID_PANTECH,
VENDOR_ID_QUALCOMM,
+ VENDOR_ID_OTGV,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))