am c692c69e: am 930d6b07: Merge "Add capability to indicate a conference will...
am c692c69e: am 930d6b07: Merge "Add capability to indicate a conference will never have children." into mnc-dev
* commit 'c692c69e':
Add capability to indicate a conference will never have children.