commit d9b732a0cb5a8a1e4242125b3048549ad275f524
author Paul Scovanner <pscovanner@google.com> Mon Aug 31 19:50:32 2020 +0000
committer Paul Scovanner <pscovanner@google.com> Tue Sep 01 16:27:04 2020 +0000
tree 0c9f27a0d93d0428e1ae3149df4a836c09f36696
parent 3250cbd459c8911edbb01e06c8abf41334b140a4
parent 8ee99c4fec8a377cae13b7ef15bffe0fd121e1e3

Update Security String to 2020-10-01

Bug: 163542576
resolve merge conflicts of 8ee99c4fec8a377cae13b7ef15bffe0fd121e1e3 to pi-dev

Change-Id: Ie984e76e3c9d76430f49fc6224bbfa968684dfc7
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a3377d3..edccd62 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -231,7 +231,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 := 2019-10-01
+      PLATFORM_SECURITY_PATCH := 2020-10-01
 endif
 
 ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP