commit 889850268559a84882abe681ec0f0d4be4fd19dc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 12 01:28:06 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 12 01:28:12 2024 +0000
tree 715f6dbd11c90dd48d337d42879473f97778216e
parent 071a70df3f2d8040165f704bb417afd1f1b80021
parent c67d9c6cfb7d35bea74eede5e40916506acaf7f5

Make change and version bump to TPM1.230623.029
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26453638'] into tm-platform-release.

Change-Id: I8f6b26d6692fa8d82acdfc7a62223279ba6c21b0

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 77dc700..cc30114 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=TPM1.230623.028
+BUILD_ID=TPM1.230623.029

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fa6d366..941ccc7 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,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-03-05
+    PLATFORM_SECURITY_PATCH := 2024-04-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk