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