tree dcb186cd827abc5c5d1e50a4a0a4bf98ca6eb193
parent 2a1aa9b4c15ff8118fcc05ebe7fff613ce7980d0
author Anthony Lee <anthonylee@google.com> 1416093660 -0800
committer Anthony Lee <anthonylee@google.com> 1416256862 -0800

Add code to show a message when a conference merge fails.

Right now the plumbing only exists for VoLTE conference calls
and GSM/CDMA calls behave as they did before. While making
this change, it made a lot of sense to rename CdmaDisplayInfo
to PhoneDisplayMessage.

Bug: 18080792
Change-Id: If8c8cf9a234371bdb2798c9d1e80d56b3aaf84f8