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

Merge changes from topic "active-unlock" 

* changes:
  Implementing lockUser
  Adding logic for active unlock to grant trust
parents 79d91e3e 40436e55
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