Skip to content
Commit 1fa723d8 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 40087027: am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock... 

am 40087027: am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev

* commit '40087027':
  Show face unlock even when fingerprint is running
parents 988f3785 40087027
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