am 89efc518: Merge "Support termination of a call while merge is in process." into...
Tyler Gunn [Thu, 23 Jul 2015 19:17:38 +0000 (19:17 +0000)]
* commit '89efc518fc673977cb768b322a9f88d36e971904':
  Support termination of a call while merge is in process.

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

Simple merge