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)
commit861480bb4977ce43dfaa1d673f15683cd99ee3ef
treeed1b03eddeda35411a0c803dab8c2caadfed56c1
parent666de4528b6589eea5d304f8674df80eee7167de
parent13d51cd39abe139a87b8360f474b7c8334c877b7
[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976
am: 13d51cd39a  -s ours

Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba