Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: a4d40c35a9

Original change: https://android-review.googlesource.com/c/platform/build/+/1356542

Change-Id: Iff9a578e391796e231aa944950f092343a7ef25b
This commit is contained in:
Bill Yi 2020-07-07 07:26:19 +00:00 committed by Automerger Merge Worker
commit 36039beafe

View file

@ -237,7 +237,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 := 2020-06-05
PLATFORM_SECURITY_PATCH := 2020-07-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH