| commit | e1878c386fb51ff5f3452a213af806b07e16a123 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 10:46:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:46:55 2024 +0000 |
| tree | c8c800860fe25ac86bdc88580c22468c378d58bf | |
| parent | 6a4d4ac97cf50c3fec85d9a1c773636d167f8709 [diff] | |
| parent | a87af100eea133672e72a6122d1eeff1c5899de3 [diff] |
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: eaa9e2edd2 -s ours am: a87af100ee -s ours am skip reason: Merged-In I5f7e7311b097362794dc6aa5bd015f4ec6f40673 with SHA-1 7014e7199c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/2990900 Change-Id: Ib2f010abe95abbb5d4c9bbd96f1e6c90e6546469 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>