diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2011-11-28 19:57:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-28 19:57:26 -0800 |
| commit | 9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639 (patch) | |
| tree | 7870060b4752aa7750dd5b8e05be0ec023a0b764 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f9e260185e9c83800ba14fdc7abeb95a399f526 (diff) | |
| parent | 77d1ebbd7bd42d849911e680a63eec02e8b444db (diff) | |
am 77d1ebbd: 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 '77d1ebbd7bd42d849911e680a63eec02e8b444db':
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