tree 5ae707d934c112b70fb71b69d349816da90693f3
parent c1a5ae082ed215626548f3f8a1b95304ad0b9ed4
parent e8b110c4cbca1f0cdc4cafb0f8c4e1353957ea7d
author Tyler Gunn <tgunn@google.com> 1471553763 +0000
committer android-build-merger <android-build-merger@google.com> 1471553763 +0000

Merge "Ensure hold capability is removed from ImsConference if hold not supported." into nyc-mr1-dev
am: e8b110c4cb

Change-Id: Ib76486814861051f766eabb25709c47badcc4f3c