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

Skip to content
Commit 4182e4b5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "Mpeg4Writer/MediaMuxer:allow empty tracks am:... 

[automerger skipped] Merge "Mpeg4Writer/MediaMuxer:allow empty tracks am: f0f0311e am: f889da53" into rvc-d1-dev-plus-aosp am: ccc9c516 -s ours
am skip reason: Change-Id If76a1f3b60d09836d53bce6f6e759e6a751f5538 with SHA-1 f0f0311e is in history

Change-Id: I9404ec35b65affab2603e5988b07192a900e1b66
parents 5991cea0 ccc9c516
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