[automerger skipped] Merge 24Q4 into AOSP main am: c5a0418122 -s ours

Browse source

am skip reason: Merged-In I1c2fb12e09ffe8083d6b14b0ee5aa957e031ddf3 with SHA-1 f03cc7ce1c is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma-sepolicy/+/3413723

Change-Id: I8b8c13745cfbffbf29411e410fef24fa284aa070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Xin Li 2024-12-13 18:42:00 -08:00 • committed by Automerger Merge Worker

parent cf6b23c473 c5a0418122

commit 46f147f372

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available