commit 0c672afc4052f162eab990fa5bd97f09ab2f927c
author Zach Jang <zachjang@google.com> Tue Jun 21 18:23:46 2016 -0700
committer Zach Jang <zachjang@google.com> Tue Jun 21 18:23:46 2016 -0700
tree 53d1bce1e01dce113c1a568ea5eedd8a79c8e55f
parent ab6c08949f2a96867b1eda536eeb74982a49d5d3
parent 12db22426993ccd0470f551c8ac05fbdbf0e9447

resolve merge conflicts of 12db224 to lmp-mr1-dev

Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1727ccc..9d1e6e0 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -73,7 +73,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-08-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"