diff options
| author | Romain Guy <romainguy@google.com> | 2011-09-27 16:44:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 16:44:28 -0700 |
| commit | fd9932d15313c10e09e4d81b37f87defd9490827 (patch) | |
| tree | 9e75054012ac2288b80c4a525c72e8dc4fe11ecb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 70980383decd0d7c2928d1950482c388467785e5 (diff) | |
| parent | 0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde (diff) | |
am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge.
* commit '0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
CherryPick 043a6b from master: do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions