diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-11 12:43:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-11 12:43:15 -0700 |
| commit | 6ec5f34691758be379ff93ed93636e9e3893c3b8 (patch) | |
| tree | 3c3f64bce9fa84c2b84082927a245821c3e307de /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ebf0d2dd562492fc3c87f4c1676ca0416a83d9cc (diff) | |
| parent | 9186b53da723970a031907714a1e49c456037741 (diff) | |
am d292d2a0: Merge 36a3a392 from mr1.
* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
Merge 36a3a392 from mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions