commit e45026effa277973081b470484836974ec6a2393
author Tao Bao <tbao@google.com> Thu Sep 14 00:43:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 00:43:53 2017 +0000
tree d242331e60b0472f51d65ecc3f6d0be8e79d570f
parent ac9cd77574a291e8289e2c41687668f340ed66d1
parent 4a5a1e15a1c52a0bc131726f34a227d0ca7c98ad

Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b
am: 4a5a1e15a1

Change-Id: Iac5021d897f0c9f83886426663cd1428ca4a9c54

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 26d4c03..cbecabf 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -207,7 +207,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-10-05
+      PLATFORM_SECURITY_PATCH := 2017-11-05
 endif
 
 ifndef PLATFORM_BASE_OS

target/product/embedded.mk

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 3466d1a..349abd4 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -20,7 +20,7 @@
 PRODUCT_PACKAGES += \
     adb \
     adbd \
-    android.hardware.configstore@1.1-service \
+    android.hardware.configstore@1.0-service \
     android.hidl.allocator@1.0-service \
     android.hidl.memory@1.0-impl \
     atrace \