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

Skip to content
Commit af9495df authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-5" into main am: ec6110bf 

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



Change-Id: I257a1abf201bc1e90c487dc75c4ebba5f7c7e650
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c65e55e ec6110bf
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