tree 9c1a7722cbd18fae97726ab2543df6c24063fd7f
parent 9ea5908d386e0ac482b025bc3235d9eb71d77e06
parent 1de2393648b9fe43977ef88b72489fec05d629a9
author Jean-Baptiste Queru <jbq@google.com> 1312233163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312233163 -0700

am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."

* commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb':
  Stagefright: Return error if codec takes too long to return a buffer.