am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '848718a04e7e50402c7c2f10718d1a7e19cf9956':
  Adding support for Cdma conference calling.

telecomm/java/android/telecom/RemoteConference.java

@@ -163,6 +163,20 @@ public final class RemoteConference {
         }
     }
 
+    public void merge() {
+        try {
+            mConnectionService.mergeConference(mId);
+        } catch (RemoteException e) {
+        }
+    }
+
+    public void swap() {
+        try {
+            mConnectionService.swapConference(mId);
+        } catch (RemoteException e) {
+        }
+    }
+
     public void hold() {
         try {
             mConnectionService.hold(mId);