| commit | 9c975f233596e154bdf6696398efb0ebc65b4746 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Wed Apr 28 19:51:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 28 19:51:56 2021 +0000 |
| tree | 617722270494b13c0fb880bb964e7c5963e5d231 | |
| parent | a4f89e68a642e4f292ff2508ad1c6108c70c9b63 [diff] | |
| parent | cf5f4d6cbf9f4b6200428741058a69961b03bea4 [diff] |
Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106 Change-Id: I47281e410de8edf621836a501596419ea0cc1d7c