Merge "Merge Android10 QPR1 into AOSP master"

This commit is contained in:
Treehugger Robot
2019-12-03 23:15:06 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is # (like "CRB01"). It must be a single word, and is
# capitalized by convention. # capitalized by convention.
BUILD_ID=QD1A.190821.011 BUILD_ID=QQ1A.191205.011

View File

@@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # 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. # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2019-10-05 PLATFORM_SECURITY_PATCH := 2019-12-05
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH .KATI_READONLY := PLATFORM_SECURITY_PATCH