resolved conflicts for merge of 246808b to jb-dev-plus-aosp

Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
CM-MTK6589 · May 15, 2012 · c7a67d0 · c7a67d0
2 parents 9dbcbe0 + 246808b
commit c7a67d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
@@ -125,6 +125,8 @@
 #define VENDOR_ID_SONY          0x054C
 // Lab126's USB Vendor ID
 #define VENDOR_ID_LAB126        0x1949
+// Yulong Coolpad's USB Vendor ID
+#define VENDOR_ID_YULONG_COOLPAD 0x1EBF
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -173,6 +175,7 @@ int builtInVendorIds[] = {
     VENDOR_ID_INQ_MOBILE,
     VENDOR_ID_SONY,
     VENDOR_ID_LAB126,
+    VENDOR_ID_YULONG_COOLPAD,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))