Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp

* changes:
  [conflict] [DO NOT MERGE] 2p: 0449bb97fa
  [DO NOT MERGE] Update Security String to 2021-11-05
This commit is contained in:
Paul Scovanner
2021-09-16 18:47:38 +00:00
committed by Android (Google) Code Review

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