diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 17:46:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 17:46:07 -0700 |
| commit | 6755f930c0bb3155c821f09ba510811d0c1bff82 (patch) | |
| tree | c45c57e57309fcb0b20e33a9262564834accdc5f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f99d25729a7b2f10d2ee78e4933d6265aee78ee8 (diff) | |
| parent | 2039f1775421ee73c2ce22df9a3a83ac736e4011 (diff) | |
am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions