[conflict] [DO NOT MERGE] 2p: 0449bb97fa

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

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
This commit is contained in:
Presubmit Automerger Backend 2021-09-16 11:39:21 +00:00 committed by Yu Gu
commit 541828d6f0

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