| commit | 58a0e0366de24f45466757f28865b9c35a265924 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Fri Dec 01 20:00:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 01 20:00:19 2023 +0000 |
| tree | 3826756a40b5b7872462fa385ef93a0da78ebfea | |
| parent | c5956d40ed2abf2843a468ea38e5ff15d1c4eae1 [diff] | |
| parent | c0e8e101886a4aa55b1ecf27c785be7cef45ffdf [diff] |
Merge "Improve the help text for the locksettings shell command" into main am: d3a4b7a01d am: c0e8e10188 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855192 Change-Id: I6a767df5e21498f0b2d64419121e00eddd8b3e10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>