commit cf227d440176f5c10b252ff75fdc6aabf7d4829d
author Zach Jang <zachjang@google.com> Wed May 25 20:57:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 20:57:41 2016 +0000
tree c71a813b7c2786017853e4781a28ce246a5ce7ae
parent 6a974cf124727c19496f202576b7520cd22175d1
parent 4af9b20fbd847ffab365a4677de0e9752737c4f3

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83
am: 4af9b20fbd

* commit '4af9b20fbd847ffab365a4677de0e9752737c4f3':
  Updating security string to 2016-07-05

Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1879410..80fd0fe 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1306,10 +1306,6 @@
   $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
   $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
   $(HOST_OUT_EXECUTABLES)/make_ext4fs \
-  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
-  $(HOST_OUT_EXECUTABLES)/mksquashfs \
-  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \
-  $(HOST_OUT_EXECUTABLES)/make_f2fs \
   $(HOST_OUT_EXECUTABLES)/simg2img \
   $(HOST_OUT_EXECUTABLES)/e2fsck \
   $(HOST_OUT_EXECUTABLES)/build_verity_tree \

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index d453303..abb4c05 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -33,7 +33,6 @@
     DownloadProviderUi \
     Email \
     ExactCalculator \
-    Exchange2 \
     ExternalStorageProvider \
     FusedLocation \
     InputDevices \