| commit | dcc0736c4341335dc73856d98ac940c2ad7eba8f | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Tue Sep 23 16:03:44 2014 -0700 |
| committer | Etan Cohen <etancohen@google.com> | Sat Sep 27 04:55:28 2014 +0000 |
| tree | 542d657553f4c9e8f2fd497e1b653d32ce6c0e40 | |
| parent | 6e2bba7d34adab1e4327cd15a3d506e61fffa777 [diff] |
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