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