Skip to content
Commit 27a45d8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I0ababa6b,I1a1ad69b into tm-dev 

* changes:
  Run cancelAction if bouncer is canceled
  Fix bouncer flicker on lockscreen shade transition
parents 4d6f7317 1de97986
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