tree d7b353c1babbabf83d58814284b45d837a524042
parent 49459e4ee88dbaa342fb6add9af51ccbadc88d98
author Brad Ebinger <breadley@google.com> 1464389890 -0700
committer Brad Ebinger <breadley@google.com> 1464718142 -0700

Add EVENT_CALL_MERGE_FAILED Connection Event

Currently, if a call merge failure occurs, we can not try again because
the merge button "gets stuck". This change adds a new Connection Event
that notifies the InCall UI to enable the merge button so that the user
can try again.

Bug: 28847375
Change-Id: I376f6ee446e135577a54aa36ff1dfc77af87261a