Commits
Adrian Roos authored and Android Git Automerger committed b90f1de216eM
am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev * commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52': Show face unlock even when fingerprint is running
Showing diff to1b5cc3a4ba4