commit 79858d44ebdf946712a801988a827d46d7f7cbe8
author Andrew Lee <anwlee@google.com> Fri Aug 22 14:53:20 2014 -0700
committer Andrew Lee <anwlee@google.com> Fri Aug 22 16:01:26 2014 -0700
tree b2ca240c839f3fb13a0fdad35a0c9f34a4376c5f
parent 3e8c8b99868aa7a50b1b53eddb78f9f775ca5416

Remove generic call merge button.

We now use the same button component for merge. Formerly, it seems
that it was included in the "extra button row" to accomodate the
add and merge options both showing at the same time. Now, we handle
this as an additional scenario for the overflow menu button.

This is prework in order to be able to delete the extra button row,
and add a different "row" for the conferece call manager.

Bug: 15862303
Change-Id: I278ea17291d8daf3c5201116a10e3641b5deb4e1