diff options
| author | Robert Ly <robertly@google.com> | 2011-06-21 15:29:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-21 15:29:07 -0700 |
| commit | 33b37ee9833d790e3687770ee4520d1066d105eb (patch) | |
| tree | c16c788b2e7a62de5b85b9fecf5b9b2674e76c8f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 94ceb1156cd2e3308cd0a17012b13489a95ed695 (diff) | |
| parent | 5292656c7ae880931501a6dbaf6b901d0921a8a3 (diff) | |
am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions