commit 0342f3997c4f6d51f1b1f48e1b6e01d392138557
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 18:23:45 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 18:23:45 2023 +0000
tree 0ee222f9f61e2ac2a1a58656854e5ad3e9ce3cef
parent b265a585204e63112f42205c0acb999c861926cc
parent 9ab44321c3a1a288205726c66441fabf53c2e41a

[coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L67700000958895381 into tm-qpr2-release.

COASTGUARD_SKIP: I5fbf72ace32d2ed650f0787c0d59ba4414ea0e7a

Change-Id: I4d5bee6cc679c512f8bcc2ce80de9e80136ca263

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 1da7fa1..d19e385 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=TQ2A.230305.008.F1
+BUILD_ID=TQ2A.230405.002

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 208e1e6..38d0510 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 := 2023-03-05
+    PLATFORM_SECURITY_PATCH := 2023-04-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk