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

Commit 154e66a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into... 

Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23c am: 95b67450 am: 748270e7 am: 405dde59

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



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