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

Commit 8d4562a1 authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 0a694f4c to master 

Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
parents 6ee3c432 0a694f4c

target/product/base.mk

+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ PRODUCT_PACKAGES += \ 
    libinput \

    libinputflinger \

    libiprouteutil \

    libjni_latinime \

    libjnigraphics \

    libldnhncr \

    libmedia \
@@ -61,7 +60,6 @@ PRODUCT_PACKAGES += \ 
    libmtp \

    libnetlink \

    libnetutils \

    libpac \

    libreference-ril \

    libreverbwrapper \

    libril \

target/product/core.mk

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ PRODUCT_PACKAGES += \ 
    ManagedProvisioning \

    PicoTts \

    PacProcessor \

    libpac \

    PrintSpooler \

    ProxyHandler \

    QuickSearchBox \