Merge Conflict--Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

Zach Jang · andi34 · commit b246e7998ede · 2016-06-07T19:39:46.000+02:00
b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
@@ -81,7 +81,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-01
+  PLATFORM_SECURITY_PATCH := 2016-05-01
 endif
 
 ifeq "" "$(BUILD_ID)"

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"`
`81`	`81`	`# Can be an arbitrary string, but must be a single word.`
`82`	`82`	`#`
`83`	`83`	`# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.`
`84`		`- PLATFORM_SECURITY_PATCH := 2016-04-01`
	`84`	`+ PLATFORM_SECURITY_PATCH := 2016-05-01`
`85`	`85`	`endif`
`86`	`86`
`87`	`87`	`ifeq "" "$(BUILD_ID)"`