commit 5ca9df0edb83009cfcc047d7db873290f090a928
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 25 05:57:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 25 05:57:46 2022 +0000
tree 53a8f57976277a5a586f913f916b167f03aae93b
parent 046a98f644dc0e482ab8a7df3de066caee8f48f7
parent d2d11848b980f1ae697ef3a1a18d8b7637bff9ab

Merge "Fix licenses and license texts." am: 24b74875e9 am: d2d11848b9

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

Change-Id: I5d9190e4cb94c8c2730cb5139538eeda0b8d8a02

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