commit 2655256570b7c1c5af6d886735835eecb99f45f2
author Elliott Hughes <enh@google.com> Wed Nov 05 02:42:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 05 02:42:04 2014 +0000
tree 8c1e2c8443273c16a25f97a8b6d1d0c7a25bf4b7
parent 5fc8f683e6345353d418cb32f4f8335964e1613b
parent 452f08a0b78e65cbd7e4cddac133e59f94d5db4c

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

* commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c':
  Add razer usb vid for future use with adb

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index eba1d20..b037268 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -158,6 +158,8 @@
 #define VENDOR_ID_QUALCOMM      0x05c6
 // Quanta's USB Vendor ID
 #define VENDOR_ID_QUANTA        0x0408
+// Razer's USB Vendor ID
+#define VENDOR_ID_RAZER         0x1532
 // Rockchip's USB Vendor ID
 #define VENDOR_ID_ROCKCHIP      0x2207
 // Samsung's USB Vendor ID
@@ -266,6 +268,7 @@
     VENDOR_ID_QISDA,
     VENDOR_ID_QUALCOMM,
     VENDOR_ID_QUANTA,
+    VENDOR_ID_RAZER,
     VENDOR_ID_ROCKCHIP,
     VENDOR_ID_SAMSUNG,
     VENDOR_ID_SHARP,