diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 17:51:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 17:51:08 -0700 |
| commit | c8391fcee60e48cc2d57e07fcad1c36a9bd8244e (patch) | |
| tree | 01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 38f30693ced45553cb684ceb7a9e3be335424706 (diff) | |
| parent | 6755f930c0bb3155c821f09ba510811d0c1bff82 (diff) | |
am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '4963cd0bd1d63fe5a444b2299758d2a2696776f1':
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