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

Commit cbe03c23 authored by Bill Rassieur's avatar Bill Rassieur Committed by android-build-merger
Browse files

Merge PPR2.181005.003 from pi-release-2 into pi-platform-release. 

am: 6d4dec0f

Change-Id: I4d4bac8775480fff8b9be87b78cd2ffecf3b51d2
parents 5b7a4ed3 6d4dec0f

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=PPR1.180905.006
 
export BUILD_ID=PPR1.181005.003

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,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-09-05

      PLATFORM_SECURITY_PATCH := 2018-10-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP