tree bd12be6e4c1878a17031dda337173be676c7d439
parent c0fbe54f0bc2feacd98424a582909d737aa83e65
parent 8a113a4a9cecdaab0fb439a49cdd26291b1708b8
author Jean-Baptiste Queru <jbq@google.com> 1337867941 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337867941 -0700

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