summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-10-20 18:38:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 18:38:37 +0000
commit1b338c6784cfe040a74acb58a6c6902d9cab3d8f (patch)
tree45f3e7e290881f1b6264239a38a8e54848c10f53 /adb
parent96072977ee95964fee355c33474932f03a96771e (diff)
parent7e38ab476f808f84f0755ccbceb4cd7d8a1982a3 (diff)
downloadsystem_core-1b338c6784cfe040a74acb58a6c6902d9cab3d8f.zip
system_core-1b338c6784cfe040a74acb58a6c6902d9cab3d8f.tar.gz
system_core-1b338c6784cfe040a74acb58a6c6902d9cab3d8f.tar.bz2
am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"
* commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3': adb: Add USB vendor ID for TrekStor GmbH
Diffstat (limited to 'adb')
-rwxr-xr-xadb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 1b8310f..eba1d20 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -184,6 +184,8 @@
#define VENDOR_ID_TI 0x0451
// Toshiba's USB Vendor ID
#define VENDOR_ID_TOSHIBA 0x0930
+// TrekStor's USB Vendor ID
+#define VENDOR_ID_TREKSTOR 0x1E68
// Unowhy's USB Vendor ID
#define VENDOR_ID_UNOWHY 0x2A49
// Vizio's USB Vendor ID
@@ -277,6 +279,7 @@ int builtInVendorIds[] = {
VENDOR_ID_TELEEPOCH,
VENDOR_ID_TI,
VENDOR_ID_TOSHIBA,
+ VENDOR_ID_TREKSTOR,
VENDOR_ID_UNOWHY,
VENDOR_ID_VIZIO,
VENDOR_ID_WACOM,