| commit | 3459089bf9f383b3ce7f1d811953b3c785eac0b8 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Aug 12 03:31:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 03:31:47 2015 +0000 |
| tree | f4e990f23cb3c47a6298a8b6953568c99ffc64e0 | |
| parent | b213354c413f8610fe32c504cb3986d875259c19 [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.