| commit | 8b33f8b68024c73cb5a1fcc6a6d44615398f86cd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Dec 13 19:12:06 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 19:12:06 2024 -0800 |
| tree | 1c912d4fee247cef9ec7d0ee236364a5b9a6c3ed | |
| parent | 8296455402c88bbd49c4d69a6477fe6429558c7d [diff] | |
| parent | 7005085a1622586a1ed0cfe3b6a9fcd17df58059 [diff] |
[automerger skipped] Merge 24Q4 into AOSP main am: 7005085a16 -s ours am skip reason: Merged-In I726ff3dab42173f1ec65c827259d7761feac134e with SHA-1 03401c8891 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/3413315 Change-Id: Id7e3ed86f79e9bad4fa25c6098a22067271b9b5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>