| commit | 8fb7bd4d02cd4ad2111699778e64464d979f03bb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 01 14:10:39 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 01 14:10:39 2011 -0700 |
| tree | 7a28275fa276a0ac31de9732df4abbca4784f28a | |
| parent | 72b7a7d90b631a703681751c02f1447e3c75ccb0 [diff] | |
| parent | 5bb3129c7eabce34d7c1469826e1795d4b225bb3 [diff] |
am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." * commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3': Stagefright: Return error if codec takes too long to return a buffer.