| commit | 0b75591afc37c2d8f76d44ac03be18f97c01ffbd | [log] [tgz] |
|---|---|---|
| author | Dmitry Dementyev <dementyev@google.com> | Tue Oct 17 01:21:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 17 01:21:27 2023 +0000 |
| tree | b24c8722efed16eecfdb2305c46c4d6f2a817fa4 | |
| parent | 59f056381a4b11ba7a49fcf57b9bdb09bc7ec649 [diff] | |
| parent | cdfaa8d5bfb5ee70926078f55b6d321a0c894bdf [diff] |
[automerger skipped] Use a copy of lock screen secret in recoverablekeystore. am: 50f0335722 am: ab420a48fa am: cdfaa8d5bf -s ours am skip reason: Merged-In I0ed183eb3a30c16db77cb12b2347794796dd88d8 with SHA-1 07b312c881 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2791426 Change-Id: Ib3af85764c0036b696aa319e6726b01320a77e16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>