Merge "Support termination of a call while merge is in process." into mnc-dev
authorTyler Gunn <tgunn@google.com>
Thu, 23 Jul 2015 17:49:26 +0000 (17:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Jul 2015 17:49:26 +0000 (17:49 +0000)
commit89efc518fc673977cb768b322a9f88d36e971904
treecc4965e30d1626c6dbf4ab7a1dd84f04e137bacd
parenteb9a8ab415c8c9c0bf54104b2b6f858e83802ba2
parent95d563ed2a215d67a4f789c3ebb5a526fb95cc7f
Merge "Support termination of a call while merge is in process." into mnc-dev