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