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

Commit f5b94825 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Consolidate occlusion events into KeyguardStateController" into tm-dev... 

Merge "Consolidate occlusion events into KeyguardStateController" into tm-dev am: 68d2fdfd am: fe824ad1

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



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