Tyler Gunn 8d2b05ab50 Merge "De-couple data enabled from VT settings." into oc-mr1-dev ...

am: e0f1f26d87

Change-Id: I424cd828a7616c2947367bdb4a82a62cf17847e7

2017-08-31 15:22:44 +00:00

..

android/telephony

Merge "De-couple data enabled from VT settings." into oc-mr1-dev

2017-08-31 15:22:44 +00:00

com/android

Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev

2017-08-30 18:48:34 +00:00