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

Commit 85e7909b authored by sync_forks@e's avatar sync_forks@e
Browse files

Merge branch 'lineage-15.1' into v1-oreo

parents b7efac96 65c2498a

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2018-12-05

      PLATFORM_SECURITY_PATCH := 2019-01-05

endif



ifndef PLATFORM_BASE_OS

target/product/languages_full.mk

+6 −0
Original line number Diff line number Diff line
@@ -103,3 +103,9 @@ PRODUCT_LOCALES := \ 
        zh_HK \

        zh_TW \

        zu_ZA



# LineageOS specific languages

PRODUCT_LOCALES += \

        ast_ES \

        gd_GB \

        cy_GB