From 57c4452e7b87d2d1c3be07001fe3fb2335130fc8 Mon Sep 17 00:00:00 2001
From: Sailesh Nepal <sail@google.com>
Date: Thu, 25 Sep 2014 18:46:45 -0700
Subject: [PATCH] Run update-api to fix build

Change-Id: Idfbf5aad2d693833bb3ac8ce77ad0331bd4f3613
---
 api/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 47ccdb7df0254..4f170e4b8d7ff 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28274,11 +28274,13 @@ package android.telecom {
     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);
   }