Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a67d0f authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

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

Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
parents 9dbcbe08 246808be

adb/usb_vendors.c

+3 −0
Original line number Diff line number Diff line
@@ -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]))