| commit | 803bf8565ed3599183f83feea22d9e4cbb1c9070 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Aug 12 03:46:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 03:46:14 2015 +0000 |
| tree | 92ef754dd1c4216651a3485aa634dded1db1af37 | |
| parent | 89c640e322a12c6dfbdb95ef2e8c1ec9bc57626c [diff] | |
| parent | db6ead532377b6d057a8861aef7b6bc0fb0f8f42 [diff] |
am db6ead53: am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev * commit 'db6ead532377b6d057a8861aef7b6bc0fb0f8f42': Fix issue where GSM conference is held in makeRoomForOutgoingCall.