commit 952f59cccde14971c9199d2f906ddd82dff5e6dd
author Paul Scovanner <pscovanner@google.com> Thu Nov 05 06:30:52 2020 +0000
committer Paul Scovanner <pscovanner@google.com> Thu Nov 05 06:30:55 2020 +0000
tree 3c16b0befd94e337ce3e023227dd8de7146e053b
parent a7beb10933218c347b67aba9c0a7c2c53d36acf1
parent 47ba91cd62e20c0f1d0e03ca1df6abb97c7c9cd9

resolve merge conflicts of 47ba91cd62e20c0f1d0e03ca1df6abb97c7c9cd9 to qt-qpr1-dev

Update Security String to 2020-10-01
Bug: 163542576

Change-Id: Ib3ea041e914229da60487137b385933f31238089
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6d55d97..2c148da 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,7 @@
     #  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-09-01
+      PLATFORM_SECURITY_PATCH := 2020-10-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH