Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 6fdd244a50cM
am 31b5e5d1: am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7" * commit '31b5e5d15972aa7c0e7579798a459c983c5610f9': libstagefright/matroska: Fix build with gcc 4.7
Showing diff to819ba00afc4