[automerger skipped] Merge "Add a new call direction parameter to conferences for multiparty" am: f5ed9171e6 am: 59d28c921a -s ours am: 7b8566e4a3 -s ours
am skip reason: Change-Id Icb576a07b9a7a81e228babfea53474be83da7593 with SHA-1 43e026594e is in history
Change-Id: Id7165c5239f7b2d69aae39b74381ae32ed08af3d
This commit is contained in: