commit 0cd3e17f5bc819a45fd824a00ca44c0ea61c1c12
author George Mount <mount@google.com> Mon Jul 27 15:02:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 27 15:02:40 2015 +0000
tree 98029d5182227f87ac6c84321e8f76f6f19f8ab3
parent 2183dcb2e315c652f1a0dd553098e2fbb6715035
parent 18cf7136a686b9fbac837736445ca7f2edd5947e

am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

* commit '18cf7136a686b9fbac837736445ca7f2edd5947e':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7da3b23..c98df0c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1507,7 +1507,7 @@
 	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
-	$(hide) echo "blockimgdiff_versions=1,2,3" >> $(zip_root)/META/misc_info.txt
+	$(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
 ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
 	# OTA scripts are only interested in fingerprint related properties
 	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 1699156..4c49e86 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -111,6 +111,7 @@
     run-as \
     schedtest \
     sdcard \
+    secdiscard \
     services \
     settings \
     sgdisk \