diff options
| author | Adam Seaton <aseaton@google.com> | 2019-01-08 14:33:46 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-15 20:59:06 +0000 |
| commit | ee2542350086fb4f17ea629f120d875eabcb37cb (patch) | |
| tree | ba208068fec5c7c8a13ad216860537acc48dad92 | |
| parent | b6b33b59534de37b738ad7de92e0dbe8ce60aebe (diff) | |
| download | build-ee2542350086fb4f17ea629f120d875eabcb37cb.tar.gz | |
Fix merge conflict into OC-M8-Release
(cherry picked from commit 7ed4804fcfc37820e59d954f4765f115055b3fbf)
Change-Id: I7dabd780411a462705e6ac283eae67b274ccf42c
| -rw-r--r-- | core/version_defaults.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index b52bdc932f..2fd0f8fc14 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 := 2019-02-05 + PLATFORM_SECURITY_PATCH := 2019-03-01 endif ifndef PLATFORM_BASE_OS |