commit 37d1efbea753f53fe0bbe82876014e516b4f3b61
author Elliott Hughes <enh@google.com> Fri Nov 21 18:29:25 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 21 18:29:25 2014 +0000
tree d6cb9766f715b4d1e19952435c91d8286b231c88
parent 5020e48e77c17958702be64e25bf64ceec34fe6c
parent aa98c835462177597eba90eac297a1a86f4a02d0

am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."
automerge: aa98c83

* commit 'aa98c835462177597eba90eac297a1a86f4a02d0':
  adb: Add USB vendor ID for Ubiquiti Networks, Inc.

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index aabf4f2..e998437 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -189,6 +189,8 @@
 #define VENDOR_ID_TOSHIBA       0x0930
 // TrekStor's USB Vendor ID
 #define VENDOR_ID_TREKSTOR      0x1E68
+// Ubiquiti Networks's USB Vendor ID
+#define VENDOR_ID_UBNT          0x1f9b
 // Unowhy's USB Vendor ID
 #define VENDOR_ID_UNOWHY        0x2A49
 // Vizio's USB Vendor ID
@@ -283,6 +285,7 @@
     VENDOR_ID_TI,
     VENDOR_ID_TOSHIBA,
     VENDOR_ID_TREKSTOR,
+    VENDOR_ID_UBNT,
     VENDOR_ID_UNOWHY,
     VENDOR_ID_VIZIO,
     VENDOR_ID_WACOM,