tree b94e5c52ea3399950ab02b09602d51a4df25c521
parent 6110e452023a0fd3ce8252b641189d6a3e57b2dd
parent a32c8e6876b5744145c059d833db36c2d9b0814f
author Tyler Gunn <tgunn@google.com> 1476926784 +0000
committer android-build-merger <android-build-merger@google.com> 1476926784 +0000

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

Change-Id: Ib9bc88c126cee7eef35ef4871f524f8719f7453b