Subject: [PATCH] Merge Conflict--Update Security String to 2016-05-01 in

 preparation for May 2016 Security OTA

Ticket: CYNGNOS-2373
b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b

parent 8205590e

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-04-02
		PLATFORM_SECURITY_PATCH := 2016-05-01
		endif

		ifeq "" "$(PLATFORM_BASE_OS)"