am 452f08a0: Merge "Add razer usb vid for future use with adb"

* commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c':
  Add razer usb vid for future use with adb
This commit is contained in:
Elliott Hughes 2014-11-05 02:42:04 +00:00 committed by Android Git Automerger
commit 2655256570

View file

@ -158,6 +158,8 @@
#define VENDOR_ID_QUALCOMM 0x05c6 #define VENDOR_ID_QUALCOMM 0x05c6
// Quanta's USB Vendor ID // Quanta's USB Vendor ID
#define VENDOR_ID_QUANTA 0x0408 #define VENDOR_ID_QUANTA 0x0408
// Razer's USB Vendor ID
#define VENDOR_ID_RAZER 0x1532
// Rockchip's USB Vendor ID // Rockchip's USB Vendor ID
#define VENDOR_ID_ROCKCHIP 0x2207 #define VENDOR_ID_ROCKCHIP 0x2207
// Samsung's USB Vendor ID // Samsung's USB Vendor ID
@ -266,6 +268,7 @@ int builtInVendorIds[] = {
VENDOR_ID_QISDA, VENDOR_ID_QISDA,
VENDOR_ID_QUALCOMM, VENDOR_ID_QUALCOMM,
VENDOR_ID_QUANTA, VENDOR_ID_QUANTA,
VENDOR_ID_RAZER,
VENDOR_ID_ROCKCHIP, VENDOR_ID_ROCKCHIP,
VENDOR_ID_SAMSUNG, VENDOR_ID_SAMSUNG,
VENDOR_ID_SHARP, VENDOR_ID_SHARP,