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

Commit 20f410a4 authored by Android Git Automerger's avatar Android Git Automerger
Browse files

resolved simple conflict with dc9cf66c

parents 114e398f dc9cf66c

fastboot/fastboot.c

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ int match_fastboot(usb_ifc_info *info) 
       (info->dev_vendor != 0x0451) &&

       (info->dev_vendor != 0x22b8) &&  // Motorola

       (info->dev_vendor != 0x0502) &&

       (info->dev_vendor != 0x413c) &&  // DELL

       (info->dev_vendor != 0x0bb4))    // HTC

            return -1;

    if(info->ifc_class != 0xff) return -1;