| commit | 5ac82abeec1827a3f94cc0a3c348ff49d5582dbc | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Tue Jul 14 17:06:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:06:58 2015 +0000 |
| tree | 88d247739591e9f43ecb1fdfb5be609fc31230dc | |
| parent | 186b15a7a176b56477b2099ea81c330649071811 [diff] | |
| parent | 724d174635721d8c2a23e91d716fd3ebe38f74d2 [diff] |
am 724d1746: resolved conflicts for merge of dc563ddb to mnc-dr-dev * commit '724d174635721d8c2a23e91d716fd3ebe38f74d2': IMS: Fix crash during midcall disabled multicall SRVCC.