diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-30 10:50:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 10:50:49 -0800 |
| commit | 27d22dc8625d4ccc2304a125de320f7ac49e2552 (patch) | |
| tree | f659360d0e1ab8afacae387de59bff6f179d64d6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2c20a13e56b6a8e3d1d6d07fe175c21ecfd31766 (diff) | |
| parent | b63de44c224b00e3186e8359c0a31b8d4c1e7f84 (diff) | |
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions