Skip to content
Commit ab3e45a2 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Don't animate scrim changes to UNLOCKED if we're occluding." into... 

Merge "Don't animate scrim changes to UNLOCKED if we're occluding." into tm-qpr-dev am: 3f5a0847 am: 1065ad78

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



Change-Id: I7dff5f604fb6258f666b58b7163cb22f0f3695de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ede747d 1065ad78
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