Skip to content
Commit 5c96be45 authored by Jonathan Scott's avatar Jonathan Scott Committed by android-build-merger
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings." into pi-dev
am: 0f8423ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ie46a3606a283c89a9a6d5fceb25af286c6433b73
parents 6421f67d 0f8423ff
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment