tree 3f6b57b1f9dc8d57ac65895637c21cec0b5e4a6b
parent d7b0e0fe6c899c32bce0e9ce881d97229fbf99b0
parent d3a4b7a01df5a9bdde4d68d5776e915a84cd31d0
author Eric Biggers <ebiggers@google.com> 1701458263 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701458263 +0000

Merge "Improve the help text for the locksettings shell command" into main am: d3a4b7a01d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855192

Change-Id: I8730c6b69cfcb40e3683384f898a7af2d263d5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>