Commit cf227d44 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

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

Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109

parents 6a974cf1 4af9b20f

core/version_defaults.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
		# Can be an arbitrary string, but must be a single word.
		#
		# 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)"