diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-16 20:29:13 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-16 20:29:18 +0000 |
| commit | a67a9f7973f3086d09314f6d040ad83e488475f1 (patch) | |
| tree | ee50f73d622f0d27d98655ad7e7286d71b54ca6c | |
| parent | 36e5bbf8b28250c2a226ce414e46a827954f8577 (diff) | |
| parent | 179127936aec8765eb713dfb8a586cc6904e6227 (diff) | |
| download | build-a67a9f7973f3086d09314f6d040ad83e488475f1.tar.gz | |
Make change and version bump to SPM2.220819.022android-platform-12.1.0_r14
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21460025'] into sc-v2-platform-release.
Change-Id: Ie884139a98a29077f7de965316669aef4210d7fc
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 1b88aca6d8..a027526519 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=SPM2.220819.021 +BUILD_ID=SPM2.220819.022 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 14acd770fc..8f7b7da2ea 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,11 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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. -<<<<<<< HEAD (428c58 Version bump to SPM2.220819.020 [core/build_id.mk]) - PLATFORM_SECURITY_PATCH := 2023-03-01 -======= - PLATFORM_SECURITY_PATCH := 2023-04-01 ->>>>>>> CHANGE (baf6b7 Update Security String to 2023-04-01) + PLATFORM_SECURITY_PATCH := 2023-04-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |