commit 52a17f52fa7fd8ae51a02552f192b905cd20d964
author Sam Lin <samlin@google.com> Wed Mar 13 17:24:45 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 13 17:24:45 2013 +0000
tree ffd45e78b83e8f2642dd4a08f7ae1effde72cec3
parent 64caa2e247a067ec0e40a2554cf8759a24245b3e
parent 461ead42fe8ab082c3ee5dd750a63ddbe45ea98a

am 461ead42: am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev

* commit '461ead42fe8ab082c3ee5dd750a63ddbe45ea98a':
  Add vendor IDs to adb

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 3a8e8fd..df9b1d1 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -131,6 +131,12 @@
 #define VENDOR_ID_KOBO          0x2237
 // Teleepoch's USB Vendor ID
 #define VENDOR_ID_TELEEPOCH     0x2340
+// AnyDATA's USB Vendor ID
+#define VENDOR_ID_ANYDATA       0x16D5
+// Harris's USB Vendor ID
+#define VENDOR_ID_HARRIS        0x19A5
+// OPPO's USB Vendor ID
+#define VENDOR_ID_OPPO          0x22D9
 
 
 /** built-in vendor list */
@@ -183,6 +189,9 @@
     VENDOR_ID_YULONG_COOLPAD,
     VENDOR_ID_KOBO,
     VENDOR_ID_TELEEPOCH,
+    VENDOR_ID_ANYDATA,
+    VENDOR_ID_HARRIS,
+    VENDOR_ID_OPPO,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))