Lei Yu 154af9a750 Unrestrict app if it been set as device admin app ...

Fix merge conlict in imports area

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf

2018-07-02 17:36:27 -07:00

..

deviceadmin

Unrestrict app if it been set as device admin app

2018-07-02 17:36:27 -07:00

DataSaverControllerTest.java

Clean up: move speciall access stuff into single package

2018-06-14 12:41:31 -07:00

EnabledVrListenersControllerTest.java

Clean up: move speciall access stuff into single package

2018-06-14 12:41:31 -07:00

HighPowerAppsControllerTest.java

Clean up: move speciall access stuff into single package

2018-06-14 12:41:31 -07:00

PremiumSmsControllerTest.java

Clean up: move speciall access stuff into single package

2018-06-14 12:41:31 -07:00

ZenAccessControllerTest.java

Clean up: move speciall access stuff into single package

2018-06-14 12:41:31 -07:00