From 51d80e39878305ffdccdf62ee7203a7af37208bb Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 21 Nov 2015 21:58:08 -0800 Subject: Undo CAF Dialer IMS conference changes * This causes weirdness with the FAB in dialtacts. Get rid of it. * Squash of the following Revert "IMS: Enable entry 4G conference call in Dialer" This reverts commit 76c9726e48ccbbcb5780ab076b7c54aadcdc621b. Change-Id: Ic326c817496294a9350c767f5ae3e83d817edd18 Revert "IMS: Fix empty URI list dial after add participant." This reverts commit daba64924bbea8a0eb49723d69c1178a7c2ef0f2. Revert "IMS: Fix Edit before call option not working issue" This reverts commit 2fec8e35dabf931fc349f7d594c5560fbf35bcc5. Revert "IMS: Fix to remove unwanted group conference icon." This reverts commit d3bbfca9fa5db701f719618d9314625626f504db. Revert "Dialer app changes for IMS" This reverts commit 8ea43d354391cd7c75dd361a316e5936e1e1db96. Change-Id: I187d935394e9a935d199b66b28910a38a248b535 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 1f8e35dc5..d398061ae 100644 --- a/Android.mk +++ b/Android.mk @@ -34,7 +34,6 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.phone.common LOCAL_JAVA_LIBRARIES := telephony-common \ - ims-common \ org.apache.http.legacy LOCAL_STATIC_JAVA_LIBRARIES := \ -- cgit v1.2.3