am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev
authorAnthony Lee <anthonylee@google.com>
Thu, 23 Jul 2015 19:33:17 +0000 (19:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:33:17 +0000 (19:33 +0000)
commit5e2ca1726a9704e92028179de3bf83626e3e9612
tree07355df5c9426c78764b0c4dc4a79e9f163f318e
parent77e4256dcb15e55e1dd09904fe7847df6be3aa02
parent22444533a7c42c71dad746322094777fee352d3c
am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

* commit '22444533a7c42c71dad746322094777fee352d3c':
  Handle hangup for 4 way conference scenario
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java