commit 246458a009980762b4be1d4a265def01bb85d540
author Elliott Hughes <enh@google.com> Thu Sep 11 14:16:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 11 14:16:02 2014 +0000
tree 12d2c312413efd4f3bfb16b8cfd496536d8d8d7b
parent 5393332e2a76e36fcf94cf862a6729f7a3f8f0cc
parent 8fa75e44f182afb9eddeb11dbb67e78397165bab

am 8fa75e44: am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"

* commit '8fa75e44f182afb9eddeb11dbb67e78397165bab':
  adb: Add USB vendor ID for Alco Digital Devices Limited

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 90542e8..1b8310f 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -38,6 +38,8 @@
 /* Keep the list below sorted alphabetically by #define name */
 // Acer's USB Vendor ID
 #define VENDOR_ID_ACER          0x0502
+// Alco's  USB Vendor ID
+#define VENDOR_ID_ALCO          0x1914
 // Allwinner's USB Vendor ID
 #define VENDOR_ID_ALLWINNER     0x1F3A
 // Amlogic's USB Vendor ID
@@ -202,6 +204,7 @@
 /* Keep the list below sorted alphabetically */
 int builtInVendorIds[] = {
     VENDOR_ID_ACER,
+    VENDOR_ID_ALCO,
     VENDOR_ID_ALLWINNER,
     VENDOR_ID_AMLOGIC,
     VENDOR_ID_ANYDATA,