Skip to content
Commit 4563bf5b authored by Evan Rosky's avatar Evan Rosky
Browse files

Fix incomplete merge 

Bug: 166736358
Test: can actually unlock phone when it boots with new transitions
Change-Id: I85e7449b05d09e70b5debf4ee2b3f3b01488e7bc
parent 961f7375
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