diff options
| author | Eric Arseneau <earseneau@google.com> | 2022-04-07 14:35:00 -0700 |
|---|---|---|
| committer | Eric Arseneau <earseneau@google.com> | 2022-04-07 14:35:00 -0700 |
| commit | 2d723f5acbc0f9fb483fc37faad10dc4d174271f (patch) | |
| tree | 7a39891908a01dc2a338c24c71b5b5dbb8c3533c | |
| parent | 82f5635b3734e97f1ded04aa4047f74dfedf3ea3 (diff) | |
| parent | 64884da24e094fd712a79296b3d2a1d56bf597c2 (diff) | |
Merge s-mpr-2022-04
Change-Id: I6aa230382c43f6bbda381d6264bc491647a00a5a
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 2be4f40eec..c683a72c31 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=SP2A.220305.013 +BUILD_ID=SPM2.220315.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 90cd2d806c..9b18e07e13 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -246,7 +246,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. - PLATFORM_SECURITY_PATCH := 2022-03-05 + PLATFORM_SECURITY_PATCH := 2022-04-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |