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

Commit 67b6d55b authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Add assets and rear display state handling in SideFpsController and... 

Merge "Add assets and rear display state handling in SideFpsController and BiometricPrompt" into udc-dev am: 0ddef87a

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



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