commit | 3816dba82e905f4451b34f8d6818179f751a7876 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 04 15:01:23 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 04 15:01:23 2020 +0000 |
tree | a0d1c79ed4c721971aa02c44f7f194631df5eab1 | |
parent | 1ddf203c27f91958f5ca851829b4efff209d8352 [diff] | |
parent | 33d851325b05654ede70f3f03a1cbeeb266e5361 [diff] |
Merge "Deactivate device admin when the ScreenLockTest is over." am: 07794a3ead am: fa785ec1fa am: 33d851325b Original change: https://android-review.googlesource.com/c/platform/cts/+/1473658 Change-Id: I1da87bf51a42c3ff264b93e086d52640599f7b08