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

Commit e16258ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge Android10 QPR1 into AOSP master"

parents c4fbb3a4 3fc4383f

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.



BUILD_ID=QD1A.190821.011
 
BUILD_ID=QQ1A.191205.011

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,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 := 2019-10-05

      PLATFORM_SECURITY_PATCH := 2019-12-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH