commit aa902718817fa1a62bd2149477bd0f4db3600368
author Paul Scovanner <pscovanner@google.com> Thu Mar 18 17:40:16 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 18 23:59:31 2021 +0000
tree 2606bebeebf4c20cc138420dc606bd618725f8b0
parent 3de8fdaeceb6d072271c5d5ce0cff1b77a0e8b98

Update Security String to 2021-05-05

resolve merge conflicts of 321db2f846e2f1d0f6a25cd0e16deb59dadf774d to rvc-qpr-dev

Bug: 182937985
Change-Id: I248e89c967a3b02e072f477594a86b568d0f94a2
(cherry picked from commit 10e01bc86527689e4bc69ef7fb0d0077cf2844bf)

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e83b8b0..b32474d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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 := 2021-04-05
+      PLATFORM_SECURITY_PATCH := 2021-05-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH