Commits
Etan Cohen authored dcc0736c434
Added mechanism to merge voice & baseline ServiceState objects. Needed in the context of separate phones handling baseline connectivity and voice connectivity (e.g. IMS). Bug: 17627405 Change-Id: Ifb5a6ea11f6350090b989408e9eed80958d8558b