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

Commit 9d4f49b5 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Merge commit '2e697ca9' into... 

Merge "Merge commit '2e697ca9' into pi-platform-release am: f9d90a67" into pie-gsi
parents b8df718f 3ce010e3

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

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

      PLATFORM_SECURITY_PATCH := 2018-09-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP