Commits
Adrian Roos authored and Android Git Automerger committed 4008702700bM
am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev * commit '4eb81345da21efc2b9731cb1969704081064690c': Show face unlock even when fingerprint is running
Showing diff to7b0f661d405