| commit | 46b0fc9b2de86241489d9d97c8f40d2e89527d29 | [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 | 6c5bf9a44339fbf7064fa9ba913dcbd1736613b6 | |
| parent | adbba1fda08cd19355a11857f06be0c3e10e7532 [diff] | |
| parent | ae182598a2d5f17e3e631165ccdd2f9459f76927 [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.