| commit | e03f834876137385cee8e14c74a09303e54f46cc | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Oct 27 22:13:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 22:13:03 2017 +0000 |
| tree | 96f342849124b4835d7c807af5d4c484420c0e2f | |
| parent | e3e0743b37f79bc0bd6d850e1802996341364156 [diff] | |
| parent | 71d372b7b25cb4405573e139d6205bf690227490 [diff] |
Prevent IMS call merge if the peer call has a pending update request. am: c7ff7ee0b5 am: 1fc4b3381c -s ours am: 71d372b7b2 -s ours Change-Id: I8fc9e9f0c98661f724f41dd98bb887c16d03c23c