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