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.
This commit is contained in:
Jean-Baptiste Queru 2011-08-01 14:12:43 -07:00 committed by Android Git Automerger
commit 880c6378ff

Diff Content Not Available