am 89efc518: Merge "Support termination of a call while merge is in process." into...
authorTyler Gunn <tgunn@google.com>
Thu, 23 Jul 2015 19:17:38 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:17:38 +0000 (19:17 +0000)
commit77e4256dcb15e55e1dd09904fe7847df6be3aa02
treec57986e14e10dcabeb8366c29ccc96d3a2788ac0
parent245869b403c10a26dee0632b7b1154652b4aa163
parent89efc518fc673977cb768b322a9f88d36e971904
am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

* commit '89efc518fc673977cb768b322a9f88d36e971904':
  Support termination of a call while merge is in process.
src/java/com/android/ims/ImsCall.java