[conflict] [DO NOT MERGE] 2p: 0449bb97fa am: 541828d6f0

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

Change-Id: I03abf503bd096fb3f1f00e438dc321aa8e10ec31
This commit is contained in:
Presubmit Automerger Backend
2021-09-16 19:01:07 +00:00
committed by Automerger Merge Worker

View File

@@ -85,7 +85,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 := 2021-10-05
PLATFORM_SECURITY_PATCH := 2021-11-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH