Skip to content
Commit 5dd10bd1 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen" 

* commit 'e2e945a8':
  third part apps can disable the secret lockscreen
parents 66a51c70 e2e945a8
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