| commit | a2616220d24b994e79fcbf33f7ce8a311fa9e8ac | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 01 13:55:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 01 13:55:45 2011 -0700 |
| tree | 33c17e44a55289307cbd0ba53f3422ab6e5d1fbc | |
| parent | b7ed8471f1b96aff901149cf9ac29e4b32672f93 [diff] | |
| parent | 5e57c2cf83ef62e9887592b46a4c3352662fb988 [diff] |
am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." * commit '5e57c2cf83ef62e9887592b46a4c3352662fb988': Stagefright: Return error if codec takes too long to return a buffer.