| commit | 154af9a75028ba8fd56f1866bd638e5bc70a04d6 | [log] [tgz] |
|---|---|---|
| author | Lei Yu <jackqdyulei@google.com> | Thu Jun 28 14:08:42 2018 -0700 |
| committer | jackqdyulei <jackqdyulei@google.com> | Mon Jul 02 17:36:27 2018 -0700 |
| tree | 5a3d0c4ff8ea450094bb2b0cf60cbec337725dde | |
| parent | 636cc6caf974f1714e6493887ce8bb35fb6bd117 [diff] |
Unrestrict app if it been set as device admin app Fix merge conlict in imports area Bug: 110337989 Test: RunSettingsRoboTests Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf