diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2012-02-13 14:42:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 14:42:42 -0800 |
| commit | a1b75b885ddb57639811fd67c29bdc51413b303a (patch) | |
| tree | f200e6c9f63d54186a2ecb6ea93f42b819cb41b4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a118238405c163cdaedb9077abd53cd7f3982eba (diff) | |
| parent | 18c64569c83afcd95247bbd1920596051fa2bc5a (diff) | |
am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions