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

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

Merge "[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default... 

Merge "[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c6368 -s ours am: 84778db6 -s ours am: ffc54fc8 am: 1eeffeb9" into qt-r1-dev-plus-aosp
am: 4a28948f -s ours
am skip reason: subject contains skip directive

Change-Id: I9216f2a70797c39b1504a77c1481522f8891e139
parents 65e2fe71 4a28948f
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