diff options
| author | Andy Quan <andyq@google.com> | 2023-02-16 07:14:39 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-16 20:29:07 +0000 |
| commit | 179127936aec8765eb713dfb8a586cc6904e6227 (patch) | |
| tree | 357d7482a68e9c426d4ad91740c9937045d74d87 | |
| parent | 36e5bbf8b28250c2a226ce414e46a827954f8577 (diff) | |
| download | build-179127936aec8765eb713dfb8a586cc6904e6227.tar.gz | |
Update SPL string to 2023-04-01
BUG: 269554597
BUG: 268558932
Change-Id: Id96cc532c260c2c1a1e778b8c5b248fb442f853d
Signed-off-by: Andy Quan <andyq@google.com>
(cherry picked from commit 097ed5791b540a7fe11a82a2ebdad658ddd207ba)
Merged-In: Id96cc532c260c2c1a1e778b8c5b248fb442f853d
| -rw-r--r-- | core/version_defaults.mk | 6 |
1 files changed, 1 insertions, 5 deletions
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 |