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

Merge "Explicitly re-show rather than reset keyguard if we're not interactive." into tm-qpr-dev

parents b569d007 e87a4dcd
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