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

Commit 47abaccd authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Gerrit Code Review
Browse files

Merge changes from topic "am-698ed0912b784575be7e2fb45ad9007c" into android12L-tests-dev 

* changes:
  Merge "[automerger skipped] Merge "media/codec2: skip secure encoders in VtsHalMediaC2V1_0TargetVideoEncTest" into android11-tests-dev am: 3dc35500 -s ours" into android12-tests-dev am: 2685c9d3
  [automerger skipped] Merge "media/codec2: skip secure encoders in VtsHalMediaC2V1_0TargetVideoEncTest" into android11-tests-dev am: 3dc35500 -s ours am: 41d614ba -s ours
parents 14f31a2d 8c1a451a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment