diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 16:38:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 16:38:05 -0700 |
| commit | 78a1235615088808e1ac2d14fec70301eb20ec85 (patch) | |
| tree | c45c57e57309fcb0b20e33a9262564834accdc5f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 947d3c64f520d12c0259d6bd391418b4ddf36494 (diff) | |
| parent | 4c190ffb0200e0d704959a5bdbd002535339f42c (diff) | |
am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions