| commit | f53f45e06f893d859b2596462fba66a17cb77d99 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Jul 07 19:12:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 07 19:12:31 2017 +0000 |
| tree | 2a0464fc7b1810facc4745dabe9b143eb65f2305 | |
| parent | f627f51b4f51aa49ab56540543004fde1f7f5a53 [diff] | |
| parent | eacef7a03a4d011b01102ab8e2edd8eb82b2e7af [diff] |
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev am: eacef7a03a Change-Id: I8e29473caf7c1cbef065909b0b40212b82648a95