[coastguard skipped] Merge sparse cherrypicks from sparse-10206733-L62800000962797378 into tm-qpr3-release.
COASTGUARD_SKIP: Iec9fd2baee0356bec1293fb68768e3ef1cb43b69
Change-Id: If9601f2dbc526d78a31ebd3ad7161d4110fd579f
diff --git a/core/build_id.mk b/core/build_id.mk
index ee59ce5..e70e58b 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=TQ3A.230805.001.Y1
+BUILD_ID=TQ3A.230805.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 60bd4cd..4fa5425 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-06-05
+ PLATFORM_SECURITY_PATCH := 2023-08-05
endif
include $(BUILD_SYSTEM)/version_util.mk
