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

Commit b08096c1 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'lineage-15.1' into eelo-0.2

parents 22bdcc32 b00da0f5

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=OPM7.181005.003
 
export BUILD_ID=OPM7.181105.004

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-10-05

      PLATFORM_SECURITY_PATCH := 2018-11-05

endif



ifndef PLATFORM_BASE_OS