diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 16:41:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 16:41:52 -0700 |
| commit | abcc8dd1d3e02da66d44b232f1a77d1e48672dc8 (patch) | |
| tree | 01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 875ee08b5fcb5b4bd47a7503ed2b1fbd1a10ca96 (diff) | |
| parent | 78a1235615088808e1ac2d14fec70301eb20ec85 (diff) | |
am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit '17cddaf2a64c8392a8e852283e720d3abdaca9b3':
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