OSDN Git Service

Merge "Add ability to add existing connection AND set parent at the same time." into...
authorTyler Gunn <tgunn@google.com>
Thu, 25 May 2017 19:55:00 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 19:55:00 +0000 (19:55 +0000)
commita39fefc2fc9746757a5430d2357f719139b0e302
tree13edce33a7dfaf775eaf1f37c8f8a8944c663687
parent1157b577a1530f9fb16557cd0a7fb1e679b359ed
parent0aea0d2c5361ce22493652e0fe9339d5b4bbc4f3
Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev am: 95f4f14e0b
am: 0aea0d2c53

Change-Id: I76805ba85bfac39cdaa3ddd2b8340423e4c7ffbe
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java