| commit | 819ba00afc40ec41cd86cc181a7f349fef626416 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 24 06:59:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 24 06:59:01 2012 -0700 |
| tree | bd12be6e4c1878a17031dda337173be676c7d439 | |
| parent | c0fbe54f0bc2feacd98424a582909d737aa83e65 [diff] | |
| parent | 8a113a4a9cecdaab0fb439a49cdd26291b1708b8 [diff] |
am 8a113a4a: am fe34006d: (-s ours) am 05cd296e: Merge "libmedia: Fix build with gcc 4.7" * commit '8a113a4a9cecdaab0fb439a49cdd26291b1708b8': libmedia: Fix build with gcc 4.7