commit 23a9ba9732b6fe80e22ed06f89262b111f7dfbce
author Sailesh Nepal <sail@google.com> Fri Sep 26 06:15:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 06:15:51 2014 +0000
tree 5f91aa315c856131516130420cdbcca6a1dd3421
parent a0bda693400a74daa824c802b9caca850397b06d
parent f46a7b1ddd4f66d65c2722cadd7a489a9e8d5b8c

am bdf84f29: Merge "Run update-api to fix build" into lmp-mr1-dev

* commit 'bdf84f29d05930a2208539da6135ca90b6bd3dba':
  Run update-api to fix build

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 47ccdb7..4f170e4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28274,11 +28274,13 @@
     method public android.telecom.DisconnectCause getDisconnectCause();
     method public final int getState();
     method public void hold();
+    method public void merge();
     method public void playDtmfTone(char);
     method public final void registerCallback(android.telecom.RemoteConference.Callback);
     method public void separate(android.telecom.RemoteConnection);
     method public void setAudioState(android.telecom.AudioState);
     method public void stopDtmfTone();
+    method public void swap();
     method public void unhold();
     method public final void unregisterCallback(android.telecom.RemoteConference.Callback);
   }