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

Commit 7783e50e authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "On occlusion: use AUTH_SCRIMMED scrim state" into tm-qpr-dev am:... 

Merge "On occlusion: use AUTH_SCRIMMED scrim state" into tm-qpr-dev am: 64d3a0e6 am: e42f12f2 am: ae24ed69 am: 5505093f

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



Change-Id: Ideace22862bb32287f752282c8847dd4fc7523be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15e3befd 5505093f
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