summaryrefslogtreecommitdiffstats
path: root/system-api
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2015-05-12 21:23:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 21:23:02 +0000
commit31e8081d1b3933f0c6fc68f0b340bdbc7ac940b8 (patch)
treeb2bece9c6612b10dcc1339dad2cd9eb45d4fb3cb /system-api
parent071e3a6f6ebb4ad028b5b62bebdb63572326623e (diff)
parent20513099ee86c484ad6af3cf4ccf6cc9fc02db76 (diff)
downloadprebuilts_sdk-31e8081d1b3933f0c6fc68f0b340bdbc7ac940b8.zip
prebuilts_sdk-31e8081d1b3933f0c6fc68f0b340bdbc7ac940b8.tar.gz
prebuilts_sdk-31e8081d1b3933f0c6fc68f0b340bdbc7ac940b8.tar.bz2
Merge "Fix build break 2" into mnc-dev
Diffstat (limited to 'system-api')
-rw-r--r--system-api/23.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/system-api/23.txt b/system-api/23.txt
index 570fe46..75abb13 100644
--- a/system-api/23.txt
+++ b/system-api/23.txt
@@ -29913,7 +29913,7 @@ package android.telecom {
method public final void removeConnection(android.telecom.Connection);
method public final void setActive();
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
- method public void setConnectTimeMillis(long);
+ method public final void setConnectTimeMillis(long);
method public final void setConnectionCapabilities(int);
method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setOnHold();