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:
commit
880c6378ff