tree 3ca68ad7e8b40031cd086305b170f080d4715b7b
parent c3c89054a2dc5b3bf9ad7857abc977c8edd91ba3
parent 6bd2b8b388a70d33224ec98ed0b55c5837c1bd43
author Tyler Gunn <tgunn@google.com> 1476925829 +0000
committer android-build-merger <android-build-merger@google.com> 1476925829 +0000

Merge "IMS Conference fixes related to RemoteConnectionServices." into nyc-mr1-dev
am: 6bd2b8b388

Change-Id: Ia9c85bc3049ba5d40b5cbbfb9b3d576d98ceecc4