diff options
| author | Omkar Sai Sandeep Katadi <okatadi@google.com> | 2024-06-25 18:04:07 +0000 |
|---|---|---|
| committer | Omkar Sai Sandeep Katadi <okatadi@google.com> | 2024-06-25 18:04:07 +0000 |
| commit | c9d470669def8e35331ddfb4a312089a86609921 (patch) | |
| tree | 1d0695c97d6410ab19ad6375e0b520d1a4ed9228 | |
| parent | e8ce7aee6b81f7c69161b5a156ea4981a9845fc8 (diff) | |
| parent | 6a15d21e6a91f69d0c553aba94549c978497d0ed (diff) | |
Merge u-mpr-2024-07
Change-Id: I4159eb9a8c2c7a8129c3b5d97bcbfa62a0cb1f21
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index a8901196dc..b574e4ed2d 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.022 +BUILD_ID=UPM1.231025.024 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 5a3714050a..df534b59f2 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-06-05 + PLATFORM_SECURITY_PATCH := 2024-07-05 endif include $(BUILD_SYSTEM)/version_util.mk |