diff options
| author | James Dong <jdong@google.com> | 2010-08-19 14:02:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 14:02:25 -0700 |
| commit | c11513b542795490787420e382b50e092c75c554 (patch) | |
| tree | 849c2bad6cc17de4aabbf3d7c77473978f489cc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8258339e47e827a3a26a4b54b0015b2fe6a01f8f (diff) | |
| parent | d8fdc20e29c5ac1e5767642f65b55fa1fe3a3236 (diff) | |
am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp
* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
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