commit d75823a4bf738600a1b75fa5fa3fa6697de83d76
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 08 18:54:23 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 08 18:54:23 2022 +0000
tree 043bcbc240d31c68732dcfab880617e0c71ba2f9
parent 5c8ad6415b8e597f1f464c13599ce597bac66e6d
parent 4f8d04b60392da6d985265d3ee2faf3a55791fb2

Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603

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

Change-Id: I4a164373f540863d6f7062347e9eb90261659202

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