diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2011-03-16 16:47:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 16:47:08 -0700 |
| commit | 0a0f15bfb3a1710b024be7be18fac4cacb9cab0e (patch) | |
| tree | 82aa4b816e1e92f3199e438728c6864998646dec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 49714fcdf974594824e33375013299a7e2d3df8e (diff) | |
| parent | 3f4f0214c129aadab1e823bf17f174b7aa696ee4 (diff) | |
am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho
* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions