Tyler Gunn 15470f9bfc Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218 am: d70e5d9317 ...

am: 61650097ed

Change-Id: Icfeff293b66b1bb062095a857c8a22ac0dcbdd63

2017-01-19 18:44:10 +00:00

..

android/telecom

Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218 am: d70e5d9317

2017-01-19 18:44:10 +00:00

com/android/internal/telecom

Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218 am: d70e5d9317

2017-01-19 18:44:10 +00:00