Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 9ff3565..68fcba2 100644 (file)
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -131,7 +131,7 @@ ifeq "" "$(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 := 2017-10-05
+    PLATFORM_SECURITY_PATCH := 2018-01-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"