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

Commit 66dc4c2f authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp 

Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
parents fc1c1a21 038908a7

target/product/generic_no_telephony.mk

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ PRODUCT_PACKAGES := \ 
    Calendar \

    CertInstaller \

    DrmProvider \

    Email \

    Exchange2 \

    FusedLocation \

    Gallery2 \

target/product/large_emu_hw.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ PRODUCT_PACKAGES := \ 
    Calendar \

    CertInstaller \

    DrmProvider \

    Email \

    Exchange2 \

    Gallery2 \

    LatinIME \

target/product/sdk.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ PRODUCT_PROPERTY_OVERRIDES := 
PRODUCT_PACKAGES := \

	Calculator \

	DeskClock \

	Email \

	Exchange2 \

	FusedLocation \

	Gallery \