| commit | 39488d119dbcdf839a98612f53ffee7ba0668912 | [log] [tgz] |
|---|---|---|
| author | Shunkai Yao <yaoshunkai@google.com> | Thu May 09 17:30:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 09 17:30:57 2024 +0000 |
| tree | 4d49b931e05ade928f91f97c75117a75691458ef | |
| parent | e34b0da0384651ba1ba0fde3af47591470ecd431 [diff] | |
| parent | 991e547386fcac0257e6a363750cbe42fc468151 [diff] |
[automerger skipped] Merge "Use customized event flag for data FMQ not_empty to avoid conflict" into main am: 0bd9cd3b8d am: 991e547386 -s ours am skip reason: Merged-In I0f5776edd58748195df61e4dae911df30f40e5b0 with SHA-1 e584b9d417 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3080609 Change-Id: Idadf3195cea59672211fafbd6c7ac709d9668932 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>