| commit | 31b5e5d15972aa7c0e7579798a459c983c5610f9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 24 08:07:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 24 08:07:45 2012 -0700 |
| tree | b6462f629919aee977afe9d2d7c1e10abec36d0b | |
| parent | 8a113a4a9cecdaab0fb439a49cdd26291b1708b8 [diff] | |
| parent | f75b6052132f1f748ae77891f6fedd1957508811 [diff] |
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