diff options
| author | 2023-10-05 00:28:22 +0000 | |
|---|---|---|
| committer | 2023-10-05 00:28:22 +0000 | |
| commit | 50b8e0fbb7d6178b7ee7124cf1fb23fb33d551c0 (patch) | |
| tree | 20e46bbcc80d62d575cb84db84bd7fc9dc0852cf /tools/validatekeymaps/Main.cpp | |
| parent | 669c741df1eadbe3ff5bd580e502286f6d31172c (diff) | |
| parent | 0068e2747e799d984fa78733d052335b47441ac8 (diff) | |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d34974d am: 98df1c6e3f am: 775cbd02d7 am: ae62a32de6 -s ours am: 5200fce012 -s ours am: ad73da7f08 -s ours am: a7ed76fe35 -s ours am: f92f9ce287 -s ours am: b7324d59b2 -s ours am: 0068e2747e -s ours
am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807
Change-Id: Iaf8588e19e259f27b51b454bbed776db6e2ed623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/validatekeymaps/Main.cpp')
0 files changed, 0 insertions, 0 deletions