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

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

[automerger skipped] Merge "EffectProxy return the active sub-effect... 

[automerger skipped] Merge "EffectProxy return the active sub-effect descriptor" into udc-qpr-dev am: d83de550 -s ours am: 1a8c07e0 -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: I11dfa0ce30514ea2f17f28f4a617f1be15fcff39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fe10eb2 1a8c07e0
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