[automerger skipped] Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future am: 8597f0f8ab
-s ours
am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 b10745144a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/27545532
Change-Id: I42dee2cd828d74e4f286f40be1df8b1bd236f945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
d304a2cc4f