commit 7c1b5d08d4a360bfe6f87dab78cbce7896690564
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 18 15:22:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 18 15:22:31 2017 +0000
tree 32ca30a4b1c5aac1dadd0fa246e493f93d02290f
parent 4ad5bbb35dc80743788fa4151e8d39f2aa491623
parent ed7dab762568a07d5353f985c7cc48eeed62b805

Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04
am: ed7dab7625

Change-Id: Ie9f53fbd629534f3bcf7f62b5ace3832d17a142e

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 \