Commit 960319ef authored Oct 23, 2017 by Elisa Pascual Trevino Committed by android-build-merger Oct 23, 2017

Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on...

Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b3 am: c4a501ce
am: 0ef4e8a5

Change-Id: I28b0939a594d948330d2bd330c67b07dae4018a9

core/version_defaults.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
		# 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-11-01
		PLATFORM_SECURITY_PATCH := 2017-12-01
		endif

		ifeq "" "$(PLATFORM_BASE_OS)"