| commit | 705c74d4ac242056c98b098bcbfadbe9b0763dbe | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 25 18:19:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 25 18:19:11 2024 +0000 |
| tree | 2db48934dac4ff39a5dce045337e8f226144ddef | |
| parent | 5bffe4a228762f70d0e72669a27c12405e1400fa [diff] | |
| parent | 00ee7f209695738c2012f251742c084467ede47c [diff] |
[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 00ee7f2096 -s ours am skip reason: Merged-In Ia0998147b40cfd4e288d6520c3391cc9e1dae1d7 with SHA-1 5bffe4a228 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/30532700 Change-Id: Id2bab353f8833ea94fdc643eb74b4bbee91a57f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>