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
2015-04-13 09:21:39 -07:00
2017-10-13 15:59:03 -07:00
2018-04-20 12:52:29 -07:00
Description
No description provided
3.1 GiB
Languages
Java 89.8%
Kotlin 10.2%