commit eeea3d73aed7c94e364ebde3e3b5b5e40b56ad5e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 28 17:35:25 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 28 17:35:56 2023 +0000
tree 6a6404e246f95feeb4a986c4678a64b658629a6b
parent e353df728f2e63ebe37b8cb8d60e11071cd3c484
parent 078cf902d933097fa080d136a53803441c62a4bf

Make change and version bump to SPM1.220819.050
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25293366'] into sc-platform-release.

Change-Id: I712c24f4757b10be1c790b5b5ff3c71dfd310fda

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 8033402..7f0850b 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=SPM1.220819.049
+BUILD_ID=SPM1.220819.050

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ac6516a..8cc5239 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 := 2023-12-01
+    PLATFORM_SECURITY_PATCH := 2024-01-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH