| commit | 6fdd244a50cf6af361cea8e6293855b21d3536b8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 24 08:12:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 24 08:12:12 2012 -0700 |
| tree | bd12be6e4c1878a17031dda337173be676c7d439 | |
| parent | 819ba00afc40ec41cd86cc181a7f349fef626416 [diff] | |
| parent | 31b5e5d15972aa7c0e7579798a459c983c5610f9 [diff] |
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