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.
This commit is contained in:
Elliott Hughes 2014-11-21 18:29:25 +00:00 committed by android-build-merger
commit 37d1efbea7

View file

@ -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 @@ int builtInVendorIds[] = {
VENDOR_ID_TI,
VENDOR_ID_TOSHIBA,
VENDOR_ID_TREKSTOR,
VENDOR_ID_UBNT,
VENDOR_ID_UNOWHY,
VENDOR_ID_VIZIO,
VENDOR_ID_WACOM,