Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 569fb2d2 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: 5c96be45
am: 26a1d676 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1cb41923711c1cadd66bb0ec820dd6a7edfded3
parents 0f6718cc 26a1d676
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