summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-07 08:03:00 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-07 08:03:08 +0000
commitd49c5457ee70a9da87d5142eb3b9edf3983514bb (patch)
treef817d720c71869d5873d57394531da6f35620ce1
parentce7f1d53ab2e8818bab0b224643c84cd41b953ec (diff)
parentb405ca08ae805259938261aa6cb11fed459d0941 (diff)
Make change and version bump to UPM1.231025.022
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27242649'] into udc-platform-release. Change-Id: I3e6f32f9f662c4f90d67e8e456634ede5613da7a
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index ad644864b4..a8901196dc 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=UPM1.231025.021
+BUILD_ID=UPM1.231025.022
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 97fe906696..d706463c1b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -104,7 +104,7 @@ ifndef PLATFORM_SECURITY_PATCH
# 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-05-05
+ PLATFORM_SECURITY_PATCH := 2024-06-05
endif
include $(BUILD_SYSTEM)/version_util.mk