Merge "Revert "Update minimum supported targetSdk to 28."" am: d643a20d8a am: cf5f83a368
Original change: https://android-review.googlesource.com/c/platform/build/+/1960148
Change-Id: I4c3a7bc75dd3886a7e4f0dd91f44c3f35e5f10a6
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