commit cf51c6cb294f77029418c85d06d49f705d52ad13
author Zach Jang <zachjang@google.com> Wed Jun 22 01:27:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 01:27:49 2016 +0000
tree 15df53991e14e028f97c18ba55ba0c080f167c5c
parent e7660e56ad330c8469857014c448130143c86856
parent 0c672afc4052f162eab990fa5bd97f09ab2f927c

resolve merge conflicts of 12db224 to lmp-mr1-dev
am: 0c672afc40

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45

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