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

Commit 986c59a8 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-8.1.0_r20' into lineage-15.1 

Android 8.1.0 release 20

Change-Id: I2ce01a15ca9651605c269b5c139b7600fd3c9296
parents 5a14a7f1 61f009fa

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=OPM1.171019.021
 
export BUILD_ID=OPM2.171019.029

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

      PLATFORM_SECURITY_PATCH := 2018-04-05

endif



ifndef PLATFORM_BASE_OS