Doris Ling 649751a4a8 Move IMS registration state to SIM status screen ...

Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.

To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.

Fixes: 66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests

Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256

2018-03-28 13:01:33 -07:00

..

anomaly-tester

Merge "AnomalyTester: Remove dependency on bouncycastle."

2018-02-23 17:36:59 +00:00

robotests

Move IMS registration state to SIM status screen

2018-03-28 13:01:33 -07:00

uitests

Merge "Update switch bar summary for spell checker page" into pi-dev

2018-03-20 02:58:38 +00:00

unit

Merge "Show time zone used in or after 2018 only" into pi-dev

2018-03-23 17:18:36 +00:00

Android.mk

…