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