| commit | 5d5682d78f173d35193f50ec2113abb3563f7538 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Fri Aug 11 02:23:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 11 02:23:15 2023 +0000 |
| tree | 549e31d212bfb76a72c1dfffabbe00f751dea704 | |
| parent | c0f1cb255e2b3f1252d187cf6fb9f8cd6f913bce [diff] | |
| parent | 88bacd764b465d594cb382c0bee6878f6d80b08b [diff] |
Merge changes from topic "locksettings-aosp-first" into main am: 852ee8e483 am: 0936166e90 am: 88bacd764b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2700638 Change-Id: I20311b4ff573c5287d3ebbf9cef3a50f136d8aa6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>