diff options
| author | Matt Lee <matthewhlee@google.com> | 2022-06-23 14:50:24 -0700 |
|---|---|---|
| committer | Matt Lee <matthewhlee@google.com> | 2022-06-23 14:50:24 -0700 |
| commit | db6a3507467439e4fba4036b1e2d94ce164fd22b (patch) | |
| tree | 65fa7d7ad2fc11154ba640e59d96f46dd5ce3098 | |
| parent | 2d723f5acbc0f9fb483fc37faad10dc4d174271f (diff) | |
| parent | 54af634080113d0efd6fedf121284a51930c71e3 (diff) | |
Merge s-mpr-2022-05-II
Change-Id: Ied5e4b0924aad1225a515edd8d163a3e5d85d54f
| -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 c683a72c31..2255b41941 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.220315.001 +BUILD_ID=SPM2.220329.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 9b18e07e13..fca8b0f3b9 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-04-05 + PLATFORM_SECURITY_PATCH := 2022-05-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |