commit cb3739b5453ffaa64daa47bd7db824f58481f9d5
author JP Abgrall <jpa@google.com> Mon Oct 20 18:38:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 20 18:38:24 2014 +0000
tree 5c4002e33d06a0bef6201a5856893e932de93fef
parent d82db1581b1f88ff85f5a88b925c6c645ba4e932
parent 7e38ab476f808f84f0755ccbceb4cd7d8a1982a3

am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"

* commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3':
  adb: Add USB vendor ID for TrekStor GmbH

adb/usb_vendors.c

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 @@
     VENDOR_ID_TELEEPOCH,
     VENDOR_ID_TI,
     VENDOR_ID_TOSHIBA,
+    VENDOR_ID_TREKSTOR,
     VENDOR_ID_UNOWHY,
     VENDOR_ID_VIZIO,
     VENDOR_ID_WACOM,