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

Skip to content
Commit 7425f171 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am 6f34bd65: am 22f74ac1: (-s ours) am bc76a890: am 4ac61017: am 051b8572: am... 

am 6f34bd65: am 22f74ac1: (-s ours) am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.

* commit '6f34bd65':
parents b5d10954 6f34bd65
Hide 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