am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."

* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
This commit is contained in:
Jean-Baptiste Queru 2011-08-01 13:59:02 -07:00 committed by Android Git Automerger
commit 0581cb2681

Diff Content Not Available