diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2011-11-28 19:55:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 19:55:27 -0800 |
| commit | ef56d02fe9155df1cd99c297e1d15f032940c4a7 (patch) | |
| tree | 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b4b54368c349df88aeb75efeb49c521a75675b89 (diff) | |
| parent | 907e5e7c09cc8f175b05fdc1904e7929e410ff83 (diff) | |
am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions