| commit | 8f6aa16d635cd7db6ce43de06d8c38addd42960f | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Fri Dec 01 19:57:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 01 19:57:48 2023 +0000 |
| tree | 6b9191912d4e772233d2f2ad7e50a1e9ab095a39 | |
| parent | 6a48ffa2a8c438b1f001828ad01371c663eeafa9 [diff] | |
| parent | 2891671f7a580e2014a6030d0e8ac6e9a33b7e6e [diff] |
Merge "Improve the help text for the locksettings shell command" into main am: d3a4b7a01d am: 2891671f7a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855192 Change-Id: I6acdee67364a98df6bef17ff6990d979348cb8e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>