From 312b8987f310db204df67d1c71b0890d8b618bea Mon Sep 17 00:00:00 2001
From: Adam Seaton <aseaton@google.com>
Date: Thu, 18 Aug 2016 10:33:30 -0700
Subject: Update Security String to 2016-10-01 to platform and CTS for October
 Security

Fix merge conflict into mmr3
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cb8ba51..1b3c7d8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -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-05
+  PLATFORM_SECURITY_PATCH := 2016-10-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"
-- 
cgit v1.1