tree 96f342849124b4835d7c807af5d4c484420c0e2f
parent 29ec0fb19061f2fd1daec19aa38b106626d201ed
parent c7ff7ee0b5ff4298cbeb1649fe0c6cad61877e7c
author Tyler Gunn <tgunn@google.com> 1509140577 +0000
committer android-build-merger <android-build-merger@google.com> 1509140577 +0000

Prevent IMS call merge if the peer call has a pending update request.
am: c7ff7ee0b5

Change-Id: I805b335a3a3814c66b47655ab2e90561ae5637de