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