Tyler Gunn 9fab4ad9b3 Merge "Self Managed CS Implementation" ...

am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd

2017-03-31 04:26:27 +00:00

..

android/telecom

Merge "Self Managed CS Implementation"

2017-03-31 04:26:27 +00:00

com/android/internal/telecom

Merge "Add further Connection-side APIs for RTT (part 2)"

2017-03-07 21:44:43 +00:00