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

..

anomaly-tester

Merge "AnomalyTester: Remove dependency on bouncycastle."

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

robotests

Unrestrict app if it been set as device admin app

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

uitests

Remove DataSummaryUsageLegacy.

2018-06-11 11:05:54 -07:00

unit

Move Fingerprint settings to biometrics/fingerprint

2018-06-25 16:51:16 -07:00

Android.mk

…