Brad Ebinger c5eacceb3f resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp ...

Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034

2016-11-02 10:33:27 -07:00

..

android/telecom

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp

2016-11-02 10:33:27 -07:00

com/android/internal/telecom

Modify ConnectionServiceAdapter to include Session

2016-11-02 09:20:22 -07:00