| commit | db6ead532377b6d057a8861aef7b6bc0fb0f8f42 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Aug 12 03:36:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 03:36:43 2015 +0000 |
| tree | 82144fd54f77cde97bc088e46f891163aa6baa06 | |
| parent | 36164a6ea15aff5a6b9e17eb6246bdef1359c691 [diff] | |
| parent | 3c326af846f42391af9798e315dbbdc85aae3efd [diff] |
am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev * commit '3c326af846f42391af9798e315dbbdc85aae3efd': Fix issue where GSM conference is held in makeRoomForOutgoingCall.