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