Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
BUG: 117431430
diff --git a/core/build_id.mk b/core/build_id.mk
index db6dcb4..7723647 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=PPR1.180905.006
+export BUILD_ID=PPR1.181005.003
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3c1c3c9..3199c09 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -231,7 +231,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 := 2018-09-05
+ PLATFORM_SECURITY_PATCH := 2018-10-05
endif
ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
