From: Brad Ebinger <breadley@google.com>
Date: Fri, 1 Sep 2017 22:11:40 +0000 (+0000)
Subject: Merge "Adds ERROR state to ImsConfig" am: 6391598412 am: 7b01ee5cda
X-Git-Tag: android-x86-9.0-r1~392^2~3^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4120ff71789d81985a2628cb5709c9264b4607b3;p=android-x86%2Fframeworks-base.git

Merge "Adds ERROR state to ImsConfig" am: 6391598412 am: 7b01ee5cda
am: ec14bc71e2  -s ours

Change-Id: I254f6d797da1fed9585ae70612a5b4ad7d53223e
---

4120ff71789d81985a2628cb5709c9264b4607b3