| commit | 1068dcd8bed643e286bfc99ae10f49f1e9c407c7 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Oct 25 20:18:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 25 20:18:04 2023 +0000 |
| tree | 5345b9c54d555fbb218ecd6e24e001cb9592ea91 | |
| parent | 40405d81b9415ac92c1f4e1095a7c99e9807b9ed [diff] | |
| parent | e444c0ec0d84ac2cde6a29da9b4f747f744081cc [diff] |
Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am: c410ea7aab am: aa4b1fc976 am: e444c0ec0d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796606 Change-Id: I063638a2a4c7856e29c475aa163faca7e91bc198 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>