| commit | 7fcb018b7a9239fb44d17bcc228b091f23888653 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Oct 09 20:52:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 20:52:00 2023 +0000 |
| tree | a46678ed5c39630b87794dbf88d4cf3337c57458 | |
| parent | 9e9f7294aef7c785b2c3789b100db9efd36cadac [diff] | |
| parent | 7df13d67febe66e23343102f58fd2118131a4c41 [diff] |
Merge changes from topic "locksettings-aosp" into main am: 7df13d67fe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775386 Change-Id: I322402280a0156dc0e0fad236a37a0c34144a226 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>