Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 5fe10eb2 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

[automerger skipped] EffectProxy return the active sub-effect descriptor am:... 

[automerger skipped] EffectProxy return the active sub-effect descriptor am: fdf42d76 -s ours am: ae89bb96 -s ours

am skip reason: Merged-In I13d92f9d8345e7d38e886adaf82f4e67eebea5a8 with SHA-1 df7bd8b2 is already in history

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



Change-Id: Ief3dbbe35f2bf37024c892274963076c52ea5aad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c83f9fae ae89bb96
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment