| commit | c6e9bb9da094862eac5206e860df1a1487043deb | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Mon Sep 11 21:33:32 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 11 21:33:32 2017 +0000 |
| tree | 70c9020b762b267aebdbd7d5826cae513b32818e | |
| parent | facdce3ab2bc237146424de838e202a444b55a7b [diff] | |
| parent | 36778ff37b348e61ecbb540457fd57a0ced8ef83 [diff] |
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev