resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am:...

resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am: cf51c6cb am: cbf1e2cc am: 9fc3cf7b am: 3749025c am: e7bc1542 Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32

resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am:...
resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am: cf51c6cb am: cbf1e2cc am: 9fc3cf7b am: 3749025c am: e7bc1542 Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
1be6c695 · Zach Jang · android-build-merger · 9f527d52 · e7bc1542 · 1be6c695
Commit 1be6c695 authored 8 years ago by Zach Jang Committed by android-build-merger 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

core/version_defaults.mk core/version_defaults.mk +1 -1

No files found.
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
  # 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)"