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

[automerger skipped] [RESTRICT AUTOMERGE] Make LockTaskController default... 

[automerger skipped] [RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings.
am: 5d6c1e8f -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6fa7b4cd500cb43075a2543744c79d3b574e6bd
parents bfe4c111 5d6c1e8f
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