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