diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-15 17:55:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-15 17:55:10 +0000 |
| commit | 36e5bbf8b28250c2a226ce414e46a827954f8577 (patch) | |
| tree | e5447d6c33227b29b9c0e2ddaa7821ff2a664e0f | |
| parent | 428c580ef3a6037a6108b717c80f5ae6c2d94a82 (diff) | |
| parent | bfac19ba270abfe5f7706ea005eb80496b7caa2b (diff) | |
| download | build-36e5bbf8b28250c2a226ce414e46a827954f8577.tar.gz | |
Make change and version bump to SPM2.220819.021
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21423410'] into sc-v2-platform-release.
Change-Id: I9ad2acae21822d4097532607e9a8f4936b1e8a66
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 77ce7fd460..1b88aca6d8 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.020 +BUILD_ID=SPM2.220819.021 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 |