Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
am: e39fa5ef8f
Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index c1c4d11..61807d8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -114,7 +114,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2017-09-05
+ PLATFORM_SECURITY_PATCH := 2017-10-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"