Skip to content
Commit 2c34290e authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes I645115ab,I73b51987,Id1b79253 into tm-qpr-dev 

* changes:
  Scrims - Don't blend with bouncer when shade is collapsing
  Transitions - Add dreaming state
  Transitions - Make them cancelable
parents 7b0af203 314d44fe
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