Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp * commit '3294d44b96f63f647fba3a03604eb028e28a42bc': Add confcall management to SIP calls
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp * commit '3294d44b96f63f647fba3a03604eb028e28a42bc': Add confcall management to SIP calls