diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-09 10:12:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-09 10:12:40 -0700 |
| commit | 47345418926aa119cf7e2181d69aadc94d51548f (patch) | |
| tree | 3b95fad964a5ac86852adf85eb49d3e17d1c5315 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | deb21d3eda89b3a3d1c436a15e8029cf87921fb1 (diff) | |
| parent | 1c251f9d9a514d2233361b88ecc657c4de9b5eca (diff) | |
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions