diff options
-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 |