commit 6fb1557fda1b18b4696c9213df7b4f542cd30d3f
author Colin Cross <ccross@android.com> Wed May 21 20:49:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 21 20:49:01 2014 +0000
tree 3ac1c26d61fd38f3effb2ada9e59a92df30d1ce6
parent e12dd2975519f071ca05513927d1dabd8129d647
parent b696bec3541dc3091fb7c8764750f8ba21f64636

am b696bec3: am 28c30518: am 1742b7d2: Merge "Modify VID for Compal"

* commit 'b696bec3541dc3091fb7c8764750f8ba21f64636':
  Modify VID for Compal

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 0c46a0c..0357ced 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -51,7 +51,9 @@
 // BYD's USB Vendor ID
 #define VENDOR_ID_BYD           0x1D91
 // Compal's USB Vendor ID
-#define VENDOR_ID_COMPAL        0x1219
+#define VENDOR_ID_COMPAL        0x04B7
+// Compalcomm's USB Vendor ID
+#define VENDOR_ID_COMPALCOMM    0x1219
 // Dell's USB Vendor ID
 #define VENDOR_ID_DELL          0x413c
 // ECS's USB Vendor ID
@@ -195,6 +197,7 @@
     VENDOR_ID_ASUS,
     VENDOR_ID_BYD,
     VENDOR_ID_COMPAL,
+    VENDOR_ID_COMPALCOMM,
     VENDOR_ID_DELL,
     VENDOR_ID_ECS,
     VENDOR_ID_EMERGING_TECH,