tree 6e6126c3b2b286e80b7124237b581801ae35c84f
parent 0ed90b7894bff07e64133bad55f5bcccaf2cf491
parent d59b5d0087c103db6bffd3cd84565ebf7fa0bb27
author Jean-Baptiste Queru <jbq@google.com> 1312231387 -0700
committer Android Code Review <code-review@android.com> 1312231387 -0700

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