commit 1be6c6952400d047de8ecf99c84efedb34edcaa0
author Zach Jang <zachjang@google.com> Wed Jun 22 01:41:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 01:41:13 2016 +0000
tree e3d6ed2296d9357466d171e410924ded1424fc5f
parent 9f527d52229c973fddd94b926b803a6be68ae440
parent e7bc1542dbdd76282ad2e37e0ae7ee57e75b723c

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb
am: e7bc1542db

Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 02a3f45..44b74a4 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 \