commit 812c0e88d5d86c29e4942f9a1010a95cce789657
author Santos Cordon <santoscordon@google.com> Mon Sep 16 04:12:53 2013 -0700
committer Santos Cordon <santoscordon@google.com> Tue Sep 17 09:57:26 2013 -0700
tree 8821cfb61cefc7f7eec1047c1a7ffc16b3e4d9c7
parent eabe3abaf927f4f730e2c743364d63b85b9480be

Outgoing/Conference UI changes for Cdma support

Changes:
- rename Cdma* to Generic* in code
- Stop showing "manage conference" for generic_conference cases
- Show simple "merge" button for generic_conference cases
- Add generic icon/name label for generic conference calls
- Do not submit a contact info request for any conference call
  sincle they always display generic information (this also fixed
  some jank of the image flipping back and forth between generic
  and normal conference call).o

bug:10769004
Change-Id: I379895612614483f7f3ea6fef493796ea855743b