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

Merge changes Ifd7bc217,I337d0189 into tm-qpr-dev 

* changes:
  Allow UserSwitcherActivity in LockDownTask mode
  Transitions - Legacy dream -> lockscreen flicker
parents 5b505035 05053527
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