OSDN Git Service

Merge "Stagefright: Return error if codec takes too long to return a buffer."
authorJean-Baptiste Queru <jbq@google.com>
Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)
committerAndroid Code Review <code-review@android.com>
Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)

Trivial merge