| commit | 32f8eb662fbc5d970942fd023430ca10ba5d0b9d | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Oct 11 19:59:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 11 19:59:30 2023 +0000 |
| tree | 475f292c16b4677f911b7ccf7428870201200a9b | |
| parent | 153b833b08a87b59cbda99457d4d975c625c3e75 [diff] | |
| parent | 9621fefc596fb9864aedf88a0ca1ff9d513d217a [diff] |
Merge changes from topic "locksettings-aosp-3" into main am: cf7db52d94 am: 9621fefc59 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779368 Change-Id: If9d4141588d5e46e4333187ccb42902870132312 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>