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

Commit d36d82a1 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolve merge conflicts of 7206a3b3 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e
parents 23854148 7206a3b3

target/product/embedded.mk

+1 −7
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ PRODUCT_PACKAGES += \ 
    dumpsys \

    fastboot \

    gralloc.default \

    grep \

    gzip \

    healthd \

    hwservicemanager \

    init \
@@ -72,17 +70,13 @@ PRODUCT_PACKAGES += \ 
    logcat \

    logwrapper \

    lshal \

    mkshrc \

    reboot \

    recovery \

    service \

    servicemanager \

    sh \

    shell_and_utilities \

    storaged \

    surfaceflinger \

    tombstoned \

    toolbox \

    toybox \

    tzdatacheck \



# SELinux packages