From aa902718817fa1a62bd2149477bd0f4db3600368 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 18 Mar 2021 17:40:16 +0000 Subject: [PATCH 1/3] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e83b8b02be..b32474d021 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,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-04-05 + PLATFORM_SECURITY_PATCH := 2021-05-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 19dfbfac57d496d3e137074f5c5579a445cc8226 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 30 Mar 2021 21:29:17 +0000 Subject: [PATCH 2/3] Version bump to RQ2A.210505.002 [core/build_id.mk] Change-Id: Iab211eb42bd98e41e9fee05b15de8fba542bd54c --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a50318dad8..da413bd1d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=RQ2A.210505.001 +BUILD_ID=RQ2A.210505.002 From 638a6cef89c8106d09f5f2e926a80533271d3216 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 2 Apr 2021 19:05:28 +0000 Subject: [PATCH 3/3] Version bump to RQ2A.210505.003 [core/build_id.mk] Change-Id: Ia5e5a43599a68b5bd39e1eb6bc7ce45b26ad4cc3 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index da413bd1d7..63aa55745f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=RQ2A.210505.002 +BUILD_ID=RQ2A.210505.003