Skip to content
Commit 56f76309 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I5150d58a,If6c3edbf into tm-qpr-dev 

* changes:
  Prevent keyguard from dismissing if not...
  Add flag to prevent keyguard bypass
parents 605e778a 5def7eb4
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