OSDN Git Service

[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into...
authorLei Yu <jackqdyulei@google.com>
Tue, 3 Jul 2018 20:54:42 +0000 (13:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Jul 2018 20:54:42 +0000 (13:54 -0700)
am: 13d51cd39a  -s ours

Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba


Trivial merge