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

Commit 6fdd244a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 31b5e5d1: am f75b6052: (-s ours) am 55536138: Merge... 

am 31b5e5d1: am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"

* commit '31b5e5d1':
  libstagefright/matroska: Fix build with gcc 4.7
parents 819ba00a 31b5e5d1
Show 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