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

Skip to content
Commit e6382cb0 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev 

* commit '115e995c':
  Fix integer overflow when handling MPEG4 tx3g atom
parents 0773dc37 115e995c
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