tree 5cef92401f645d6967b379752c3b57271e84f25f
parent 35aadabe45307f5acba0dc05b79d1ed32a8cfe8b
parent f8c556c357ad1dcc48be1189622975abf7588c80
author Shunkai Yao <yaoshunkai@google.com> 1732331488 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1732331488 +0000

[automerger skipped] Merge "AudioFlinger: remove global effect enablement timeout" into main am: 6fb00c7816 am: f8c556c357 -s ours

am skip reason: Merged-In I2fb7fe98df4dc63972511efe814841668d6645d3 with SHA-1 4995000daf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3369089

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