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

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

am efabeff1: am 7d3be414: am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34:... 

am efabeff1: am 7d3be414: am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev

* commit 'efabeff1':
  Fix integer overflow when handling MPEG4 tx3g atom
parents 163f5307 efabeff1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment