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