| commit | 192e7ccf4584c1b16b3d44f29a1d8e763f2d8ee6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jul 26 02:16:55 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 26 02:16:55 2017 +0000 |
| tree | 41a05004f271649b015739caa4be33c95dd29498 | |
| parent | 4ac942f140a5f4e7a131e59b5600e777794eb813 [diff] | |
| parent | 0f3e0b18c1541c8b42cbfebd272c97d72e2aa802 [diff] |
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev