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