| commit | 4817ded07b09de215cd92917ec598ef8c49ffa0f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 12 01:00:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 12 01:00:09 2022 +0000 |
| tree | 11fbcae7a9f870f1a236bc3b36fd09bde1e02c57 | |
| parent | b878b8ff56bfca1836129331d453a74d2c6aeed6 [diff] | |
| parent | 5955f8a521cc7aab1bc143debd10027027656c09 [diff] |
Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf am: 5955f8a521 Original change: https://android-review.googlesource.com/c/platform/build/+/1941454 Change-Id: I63b78b94f3b39f72935413e77e7fdc887fbc6ae2
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..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