tree d8590db0bbbcc82ed1f7ca42c5ddcc15f9e9db2c
parent dcbef63f51e6e120f80e7febe7ca6ec0e3cff72d
parent a2f5de28fb2d8af314bab8ba1cd6142259b7b37a
author Tyler Gunn <tgunn@google.com> 1476926247 +0000
committer android-build-merger <android-build-merger@google.com> 1476926247 +0000

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

Change-Id: Iff68e4397ede45f7836ae096459765e13f982754