commit aa98c835462177597eba90eac297a1a86f4a02d0
author Elliott Hughes <enh@google.com> Fri Nov 21 18:09:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 21 18:09:16 2014 +0000
tree 0b9fc661323e6a6eebc22a10967268a9a7b9a91a
parent dd6b662c4f20f89876cee7a52e4b6d9e33d2bfca
parent 01d49e854fa09a776c9673b229efcfa2d53adfea

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

* commit '01d49e854fa09a776c9673b229efcfa2d53adfea':
  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,