am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev
Anthony Lee [Thu, 23 Jul 2015 19:33:17 +0000 (19:33 +0000)]
* commit '22444533a7c42c71dad746322094777fee352d3c':
  Handle hangup for 4 way conference scenario

1  2 
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java

Simple merge