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:44:32 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 19:44:32 +0000 (19:44 +0000)
commit0aea0d2c5361ce22493652e0fe9339d5b4bbc4f3
tree8320496f3bc73bc9c4dc6c7cafc4acbd62d3182f
parente406d52628a9ef8075e6f49dcb157f7a47a4766b
parent95f4f14e0b93fa6b80723e3c48b2c461f97dea8f
Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev
am: 95f4f14e0b

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