tree 274a68eded7780a64ae5b78525b2ff85fa877c69
parent a87ad0a1c6acdb3e4c68fc1ef4f748cdc561b2b3
parent d0ae0710c72467eb5fba9cf5ac8d8662cd357e4f
author Elliott Hughes <enh@google.com> 1726677475 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1726677475 +0000

[automerger skipped] Merge "Add a CTS workaround for AID_CROS_EC." into android15-tests-dev am: 09bfe337aa -s ours am: d0ae0710c7 -s ours

am skip reason: Merged-In Iade578a1cfabc37a0acfb3488f225eaaf9c6536c with SHA-1 618ce1b386 is already in history

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3272271

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