commit | ae4c328f88d79bccc041ab14d691978cdf19c06f | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Thu Aug 18 20:56:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 18 20:56:03 2016 +0000 |
tree | 5ae707d934c112b70fb71b69d349816da90693f3 | |
parent | c1a5ae082ed215626548f3f8a1b95304ad0b9ed4 [diff] | |
parent | e8b110c4cbca1f0cdc4cafb0f8c4e1353957ea7d [diff] |
Merge "Ensure hold capability is removed from ImsConference if hold not supported." into nyc-mr1-dev am: e8b110c4cb Change-Id: Ib76486814861051f766eabb25709c47badcc4f3c