commit | 6fdcfe2bc25feae077a14190d33339be313cd538 | [log] [tgz] |
---|---|---|
author | Curtis Belmonte <curtislb@google.com> | Tue Sep 07 05:08:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 07 05:08:25 2021 +0000 |
tree | 28c58a17952de97a0a60814ccb1e0471c52765fd | |
parent | 7dbf9d486a16b6d95567ba298d462bb4581b6d97 [diff] | |
parent | da37abe1cc00c77fb30b8c1ec613e0b6bc35ad92 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev am: b4a1d57267 am: 7b099eaf18 -s ours am: 6487f0961a -s ours am: da37abe1cc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15763851 Change-Id: Ifd1170c7c3550b04049bfd372b8900d3a82efa7e