commit e7bc1542dbdd76282ad2e37e0ae7ee57e75b723c
author Zach Jang <zachjang@google.com> Wed Jun 22 01:38:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 01:38:31 2016 +0000
tree 5e6bcdbdb9be3d63393ae0481a699f6cbc55f6d9
parent 5d77e7e0c1425c8d1ed60dd5425267ce79ef4648
parent 3749025ccbbc0776fe10c5813262ed771e7185b6

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2
am: 3749025ccb

Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cb8ba51..d90f3dc 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-08-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"