am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in...
am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev
* commit '3c326af8':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.