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

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

am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved... 

am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit 'ffe509ff':
  Prevent integer overflow when processing covr MPEG4 atoms
parents d6ea7f65 ffe509ff
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