commit | 921599389e0cf7bfab5914022ba8d5acd14295ba | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 22:02:50 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:02:50 2023 +0000 |
tree | d5c7f8c6c759609667fb21d45fb736d67175d4bd | |
parent | 54d50f6b7963e1546014af006aab45306aa98624 [diff] | |
parent | 7e85f7f5697beac700d7b49fca204efd03271eda [diff] |
[automerger skipped] Merge Android 14 QPR1 am: b1a971a6e2 -s ours am: 7e85f7f569 -s ours am skip reason: Merged-In I08b8a7fdbc3fcfdf0fa59878ae3d1cbce81a3140 with SHA-1 ba6c244705 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/2863162 Change-Id: Ic099e28b3c517bc8a80cab7095e3e75cfd4ebfea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>