| commit | e12dba6db3b6b731111f61a97f43ec5a8e7cccb6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 22:58:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:58:03 2023 +0000 |
| tree | 566ce6d7c84eaf9e3b354e964b7f88c77aba4e53 | |
| parent | 05e2ef936e3b8e318d26b518a992e95b29883ab8 [diff] | |
| parent | 921599389e0cf7bfab5914022ba8d5acd14295ba [diff] |
[automerger skipped] Merge Android 14 QPR1 am: b1a971a6e2 -s ours am: 7e85f7f569 -s ours am: 921599389e -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: I9a9e9fa259b0547b572943ab9746ff19dc1f5bb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>