Commit 7b164ae4 authored May 25, 2016 by Zach Jang Committed by android-build-merger May 25, 2016

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c0894...

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c0894 am: e7660e56 am: 7cc20fe0 am: bf5d08ec am: db34ed5f am: 4af9b20f am: cf227d44
am: e29b42ff

* commit 'e29b42ff':
  Updating security string to 2016-07-05

Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2

parents 6a912c14 e29b42ff

core/version_defaults.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
		# Must be of the form "YYYY-MM-DD" on production devices.
		#
		# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
		PLATFORM_SECURITY_PATCH := 2016-07-01
		PLATFORM_SECURITY_PATCH := 2016-07-05
		endif

		ifeq "" "$(PLATFORM_BASE_OS)"