aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-06 02:43:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-12-06 02:43:35 +0000
commit9ebd11978bd1f1915cfd3f4019148a0a3cffa1e8 (patch)
treee81df2429a90dee222317d7e99b541fc2114638f
parentb2c7fe6a6ac81e54c330b6a44f7b5fb0a1e63ca1 (diff)
parentd2585f429221203eeb4608821101ebdc9b229a27 (diff)
downloadbuild-9ebd11978bd1f1915cfd3f4019148a0a3cffa1e8.tar.gz
Merge "Make change and version bump to SPM1.220819.017 am: cf14c1bd1f" into android12-gsi
-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 4af7d09138..116a798d21 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.016
+BUILD_ID=SPM1.220819.017
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3da5d7dd8c..6c640f4732 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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 := 2022-11-01
+ PLATFORM_SECURITY_PATCH := 2022-12-01
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH