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