Skip to content
Commit 38ae1196 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android Git Automerger
Browse files

am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 

* commit '7cd6aaaf':
  Allow shell to disable keyguard when not secure
parents 01232c50 7cd6aaaf
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