tree 65b004e4db4538035e91fde8a15f214200f7dd55
parent e82c319beb2275ad0832cf77252943e16df04b1a
parent 972c502722d52cced15a0e4b5cb303ccf3f890ed
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."