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

Skip to content
Commit 8ce12251 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: I2a7dbd2cb6dfa89bc535e90e74a52365fd97766a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 037f0026 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