commit 1a2b2c5f24de8f8a019d388fc7a639deae1d5476
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 31 04:56:06 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 31 04:56:13 2024 +0000
tree d9c6529c4e455cfd5067d05b4b2e77475ee72ed4
parent d7c9b4c9f7f11acad688a10540d316e9e659e24c
parent fba2638a79de61b31bda16f9ed53ca49f08e6788

Make change and version bump to RPM1.220718.058
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26075426'] into rvc-platform-release.

Change-Id: I8400aafca676d05f67e18408c8dfb20c1532c85f

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 7db8496..1672560 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=RPM1.220718.057
+BUILD_ID=RPM1.220718.058

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 78715c3..90002ff 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 := 2024-02-05
+    PLATFORM_SECURITY_PATCH := 2024-03-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH