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