| commit | bc9360ea4eb3b17ba28a72b1898694f528b00ef0 | [log] [tgz] |
|---|---|---|
| author | Joshua Duong <joshuaduong@google.com> | Thu May 13 20:29:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 20:29:47 2021 +0000 |
| tree | c5775488c3e8f39498e38c95613266c790cb6390 | |
| parent | c881ac71b59376305f81c1cb2552c817bf5fc053 [diff] | |
| parent | 3b2decbb34e30736a9d6fa9d8d43a37a1db165d0 [diff] |
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645 Change-Id: Iadbd63a4c99d148179b41be32a3862a2fcdd617c