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

Commit 88866f42 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Add additional toggleable active unlock settings" into tm-dev am:... 

Merge "Add additional toggleable active unlock settings" into tm-dev am: 0dd4d731 am: 60903c58 am: 8fb9cff3 am: 01b24015

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18173162



Change-Id: I8b2729674559bd5cc3c78b06cc6f298fbfbab81c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e79187e 01b24015
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment