tree 2c91b1f1c71a3f8e3d8867773124f943d5815f97
parent d05eb9e6039278bb514854d7b5fbc99574a50d97
author Shriram Ganesh <sganesh@codeaurora.org> 1433498017 +0530
committer Anthony Lee <anthonylee@google.com> 1435703186 -0700

IMS: merge option not shown after srvcc

After srvcc, conferenceable property set by the Telephony connection
service is getting overridden by Ims conference controller. So remove
the connection from Ims conference controller after adding it to
Telephony conference controller.

Bug: 21953444
Change-Id: I5e4ec8b8c7c96f4d8049344beaa117b976db9cea