| commit | 783078ae826253525b2247961308c3945c9a23dc | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Oct 09 23:28:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 23:28:27 2023 +0000 |
| tree | c952ed1f4a05950975f3bfe1dc9b0ffe363ab7ee | |
| parent | e4098a22db5d10f8a53ec0690c6944a2819158f6 [diff] | |
| parent | efc429015e0e8bfe9b6afb7da9dee35bf899dc8b [diff] |
Merge changes from topic "locksettings-aosp" into main am: 7df13d67fe am: 7fcb018b7a am: 40832590c7 am: efc429015e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775386 Change-Id: Ie44e85c188f23d0661ca9efebc7799cbbb688841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>