commit cbf1e2cc945ca1a5d70b6e8c213c4c7a428b9090
author Zach Jang <zachjang@google.com> Wed Jun 22 01:30:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 01:30:23 2016 +0000
tree 4e18e2334fe37d6bb3ee1ec9de320f5dfc429351
parent 7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb
parent cf51c6cb294f77029418c85d06d49f705d52ad13

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

Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee

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