tree 5029b35399fcf52b1986b7d2c96fcbb8b0880cb2
parent 222dfc784e5c5b4eb6a4770b9f46fe96eecbd65d
parent 925a7d8f062c2ef275ccb7579889d6f83d0d378e
author Danielle Millett <dmillett@google.com> 1332427678 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332427678 -0700

Merge "Added a setting for whether biometric weak liveliness is enabled."