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