| commit | 3e50c9ea1b80b23e26faf84c4b15bd08ac433621 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Oct 16 22:40:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 16 22:40:15 2023 +0000 |
| tree | 4ff761d939c954d4a23db5b45c13e3b195723dd2 | |
| parent | 3ae5657e21f95930434a0e921201ab01f4631b4d [diff] | |
| parent | 694c0759918fba8cc2e0f83552c2f4d3e595568d [diff] |
Merge changes from topic "locksettings-aosp-4" into main am: 5402a800e0 am: 694c075991 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781894 Change-Id: If1ca8c3c6869d52797354557fcd63e8831261a00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>