commit 4f78caaa4ef2a5b3171ffacf9025d1b149ee53c5
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 24 14:35:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 24 14:35:04 2022 +0000
tree 73bd89ed328727ecf9d7b13c9467192387e4f6ba
parent 2de0ca59d6ad02f7626704bb96f87618ca220e88
parent 08fbf0f75a1d64eb2c0864a25e5a34a5fb25426d

Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a

Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2e9363f35a74ab594e7bcc2308cb641ffe93d405

core/build_id.mk

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

core/version_defaults.mk

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