Commits
Ruben Brunk authored and Android Git Automerger committed df049d6f227M
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev * commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43': Disable face unlock when returning from camera.
Showing diff toe5bdd85a998