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

Skip to content
Commit 5b4fd1ce authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

[automerger skipped] Mpeg4Writer/MediaMuxer:allow empty tracks am: f0f0311e am: d0afc85f am: fadfc15f -s ours
am skip reason: Change-Id If76a1f3b60d09836d53bce6f6e759e6a751f5538 with SHA-1 f0f0311e is in history

Change-Id: I16a9d2c2bc74f66291fa63fdf5fdd7414e23a7ef
parents 0a810837 fadfc15f
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