commit b878b8ff56bfca1836129331d453a74d2c6aeed6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 12 00:59:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 12 00:59:58 2022 +0000
tree 9ae94280cf10e544820085615475ae0f600f4925
parent ff5f9c27aae0808330e2b280956b4c264f308d5c
parent e27ecb85d4f883ea5021eb29be0f55d735198d09

Merge "Fold annotations." am: b3f3e7b3f7 am: e27ecb85d4

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

Change-Id: I596d2bfe32bbb85091f39b2a11068e27734ed9ad

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..4dbc941 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-02-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH