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