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

* commit '7461b5a019dca6e02f1ddba0f75a6548e40fb632':
  Adding support for Cdma conference calling.

telecomm/java/android/telecom/RemoteConference.java

@@ -166,6 +166,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);