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