commit 9b4daacaf8f7ce5a534fae524507e4a4f7622ce4
author Baligh Uddin <baligh@google.com> Fri May 20 17:14:04 2016 -0700
committer Baligh Uddin <baligh@google.com> Fri May 20 17:14:04 2016 -0700
tree 2444f824bc15c458ed5ba99fdb05de636b39a3a0
parent 9606ea8a4306ac2be9b3d9c17ad7dc890cf25170
parent 6c70b85cb3c75650e5154366fb5e08e3aadf9a50

Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev

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 \