commit 312b8987f310db204df67d1c71b0890d8b618bea
author Adam Seaton <aseaton@google.com> Thu Aug 18 10:33:30 2016 -0700
committer Adam Seaton <aseaton@google.com> Wed Aug 31 09:34:11 2016 -0700
tree dfca45dcf9b80d88de96de43bc98f0b9d8e5a184
parent cf4d1c7d32d3d93866fecc780d8d6740d24bd425

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

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 @@
   # 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)"