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

Skip to content
Commit b07c4a8d authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved... 

am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev

* commit 'f86b266c':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX
parents 5aa85d05 f86b266c
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