summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmkar sai sandeep <okatadi@google.com>2024-07-17 20:54:40 +0000
committerOmkar sai sandeep <okatadi@google.com>2024-07-17 20:54:40 +0000
commita2b0f8cf162e458be0aa869adb157d18d48d56c0 (patch)
tree7246a2f0ef4590ea5bd0c427927d5e25558f11ad
parentc9d470669def8e35331ddfb4a312089a86609921 (diff)
parent96e4a27f33484b1b3fafe06f90224f0f10765325 (diff)
Merge u-mpr-2024-08
Change-Id: I7bf8f3876bc7a04d282f8d82a3b23646859bd156
-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 b574e4ed2d..d466108af8 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.024
+BUILD_ID=UPM1.231025.026
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index df534b59f2..1c5e78db65 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -113,7 +113,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-07-05
+ PLATFORM_SECURITY_PATCH := 2024-08-05
endif
include $(BUILD_SYSTEM)/version_util.mk