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

Skip to content
Commit 90e530fe authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add ShadeController to KeyguardViewMediator" into... 

[automerger skipped] Merge "Add ShadeController to KeyguardViewMediator" into tm-qpr-dev am: a1d923e1 am: f8ae5fff -s ours

am skip reason: Merged-In I9cb717410e32c1f2da2711c91f532ab05c0b410b with SHA-1 ae071e81 is already in history

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



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