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

Commit 5d6e901d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ActiveUnlock Settings" into tm-dev am: e6c8903e am: 06c4607d 

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



Change-Id: I1aa0d61e9f974c9b5970e0a0754f1aa0b776f775
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ff9d4a6 06c4607d
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