From 03caf5f05bda261e3995d63a080d94153892565b Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 13 Mar 2018 13:05:51 -0700 Subject: DO NOT MERGE Updating security string for oc-dev to 2018-05-01 Bug: 74345861 Change-Id: I162bcd6169c91b4f858a05c932d1d58887931945 (cherry picked from commit fa108abad4f1f2a0ecd623c506077869caf053b3) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index ba494ff0c1..ad38a7a688 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,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 := 2018-04-05 + PLATFORM_SECURITY_PATCH := 2018-05-01 endif ifndef PLATFORM_BASE_OS -- cgit v1.2.3 From 43c240efef5cff985eef4a3bc71e8458101de7e6 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 22 Mar 2018 15:15:20 -0700 Subject: Update Security String to 05-05 on release branch (cherry picked from commit 15d6d5502cb5eb2b2054c8baecadccc4422854c9) Change-Id: I933c7674d33c4d5d44680d00fd9af70ffd45664a --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index ad38a7a688..a15537e4b1 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,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 := 2018-05-01 + PLATFORM_SECURITY_PATCH := 2018-05-05 endif ifndef PLATFORM_BASE_OS -- cgit v1.2.3