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

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

am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev 

* commit '94f8150b':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX
parents 2abbc048 94f8150b
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