diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-08-01 13:59:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-01 13:59:02 -0700 |
| commit | 0581cb268102b3b07009950fbdb9da16dee7361c (patch) | |
| tree | 6e6126c3b2b286e80b7124237b581801ae35c84f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c1cf37d14599c6a27355432ccfd5d4e724dab2a4 (diff) | |
| parent | 46b0fc9b2de86241489d9d97c8f40d2e89527d29 (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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions