Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899
Change-Id: Ibc792f2f6cdc688690d4ea5cca6a963695f038c8
diff --git a/core/build_id.mk b/core/build_id.mk
index ba5ca42..2f9c3f3 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=AOSP.MASTER
+BUILD_ID=MASTER
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 051de62..df11f3b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,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 := 2022-01-05
+ PLATFORM_SECURITY_PATCH := 2022-03-01
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH