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

Skip to content
Commit 26143c2e authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Fix overflow/dos in 3gg text description... 

Merge "[automerger skipped] Merge "Fix overflow/dos in 3gg text description parsing" into qt-dev am: 2ffe8ab8 -s ours am: 8bd5476d -s ours
am: 068e98c3 -s ours
am skip reason: change_id I8765ac9746c3de7d711ef866d4ec0e29972320c0 with SHA1 851e22d1 is in history

Change-Id: Ic299b7342fa5a2b232cb8f5dd8092d596c9a8cb5
parents 81e9401e 068e98c3
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