diff options
| author | Steve Berbary <sberbary@google.com> | 2023-02-10 03:23:54 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-15 17:55:00 +0000 |
| commit | bfac19ba270abfe5f7706ea005eb80496b7caa2b (patch) | |
| tree | 518ac16688bcf4a97edbdd62e4f1d871c4912a21 | |
| parent | 428c580ef3a6037a6108b717c80f5ae6c2d94a82 (diff) | |
| download | build-bfac19ba270abfe5f7706ea005eb80496b7caa2b.tar.gz | |
Update Security String to 2023-04-01
Bug: 268558932
Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
(cherry picked from commit baf6b726c429ad90b2785e061e710cf5cee0d2b2)
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
(cherry picked from commit 11ec0e76aeaea5149c3394c59ee2d9488ab4d105)
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
| -rw-r--r-- | core/version_defaults.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1bb76e4992..14acd770fc 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,11 @@ 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) endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |