diff options
| author | James Dong <jdong@google.com> | 2010-08-21 09:43:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:43:41 -0700 |
| commit | a07a45572cf2a1fe012581cdb3a5682ab68c6fd3 (patch) | |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f84f146159922eb1f5d9bec7ec9a71cda1e866b1 (diff) | |
| parent | c11513b542795490787420e382b50e092c75c554 (diff) | |
am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'
* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
Make MediaWriter stop and pause return errors if necessary
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions