Skip to content
Commit 0c76ea59 authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge changes Ic62b7358,Ic3f7e62a into tm-qpr-dev 

* changes:
  Fix scrim turning opaque during occlusion animation.
  Delay keyguard hiding until after occlusion animation ends.
parents 04cbb0e2 55816370
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