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

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

Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am: 7fcb018b 

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



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