OSDN Git Service

Merge "Adding self-managed connection service APIs." am: 3a7253a09d
authorTyler Gunn <tgunn@google.com>
Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
commitd70e5d93171e0b771b1d4b2ceff26084a5797e4e
treea158bb949308577494a31aa255f6392ddfdefe1f
parent5e17fe3e8c0cd9560c0832a9412b75c107b3c3d6
parent2155be0218cf9676ac531f0524a705f38941cc15
Merge "Adding self-managed connection service APIs." am: 3a7253a09d
am: 2155be0218

Change-Id: I75319e09f352905ffa45194086b11711f9070c70
core/res/AndroidManifest.xml
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java
telecomm/java/android/telecom/RemoteConnectionService.java