diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-07-08 10:41:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-08 10:41:35 -0700 |
| commit | 1a1c333424ea1d3f4a1d2fc339ea90c790cc962c (patch) | |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 68843705a557cc69241e969c21affee60d2df864 (diff) | |
| parent | 104a2351c7a0773d4604708b91345385d52c9889 (diff) | |
am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions