| commit | a32525fcbad6e12eec690c6b3c7583dfc718891d | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Mon Sep 11 22:07:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 11 22:07:34 2017 +0000 |
| tree | afd5cdcca0d8746f24db4932755dc12cea0164ee | |
| parent | e7454950f62ff7fc90f66cde41b7e6e01352bc73 [diff] | |
| parent | 1540738d55665efea456d97f2f0290a9c15d99d9 [diff] |
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev am: c6e9bb9da0 am: 1540738d55 Change-Id: Ic39acd56e431f535b507d1a1aa1054d3cdfd3018