am 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in...
authorTyler Gunn <tgunn@google.com>
Fri, 24 Jul 2015 05:09:25 +0000 (05:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 05:09:25 +0000 (05:09 +0000)
commit1edca340159b5e020ec0827fdfa6edfc759ab166
treec57986e14e10dcabeb8366c29ccc96d3a2788ac0
parentdce8d77f458f69b1f043bd0518aa9fce364ae2bd
parent77e4256dcb15e55e1dd09904fe7847df6be3aa02
am 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

* commit '77e4256dcb15e55e1dd09904fe7847df6be3aa02':
  Support termination of a call while merge is in process.