diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2010-05-25 17:44:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-25 17:44:46 -0700 |
| commit | f35ce7f8ee2d14b6cf0785fc671fcdfeeb1682cb (patch) | |
| tree | bfd9407f1636d61ad1082b379b3e7fca6bc1d69c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b35cd7dde521746401158fdc4f3324e6e53e095a (diff) | |
| parent | 6e0967b3c4561e188df72f478baf16c6627b12be (diff) | |
am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken
* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
Added the runtime parameters for the mediarecorder stress test.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions