Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb57 am: 97ca005658

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17615283

Change-Id: I46902b449b34ff8fbd665aaf339b03ce6636ff49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-11 20:10:44 +00:00
committed by Automerger Merge Worker

View File

@@ -103,7 +103,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-05-05
PLATFORM_SECURITY_PATCH := 2022-06-05
endif
include $(BUILD_SYSTEM)/version_util.mk