| commit | 89acd1abe8dc3eec5aee678160097f8da2a79077 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Aug 27 12:21:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:32 2015 +0000 |
| tree | 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449 | |
| parent | eca598248c2ea85aeade359b8573dd6f6001db71 [diff] | |
| parent | 3459089bf9f383b3ce7f1d811953b3c785eac0b8 [diff] |
am 3459089b: (-s ours) am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev * commit '3459089bf9f383b3ce7f1d811953b3c785eac0b8':