Merge "Handle hangup for 4 way conference scenario" into mnc-dev
Anthony Lee [Thu, 23 Jul 2015 19:18:17 +0000 (19:18 +0000)]
1  2 
src/java/com/android/ims/ImsCall.java

Simple merge