| commit | 880c6378ff5bb1362cf0617cbfd5266425e8d6c8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 01 14:12:43 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 01 14:12:43 2011 -0700 |
| tree | 37fc3cd72c05d8b13eba161a1a86b3d0899e828f | |
| parent | d01002ef74782aced60165ca0478d8a4576166bd [diff] | |
| parent | 2f7b9bf2d1d65a70fc0d0b2281ca765e0619b44d [diff] |
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.