diff options
| author | Robert Ly <robertly@google.com> | 2011-06-20 09:51:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-20 09:51:08 -0700 |
| commit | 5292656c7ae880931501a6dbaf6b901d0921a8a3 (patch) | |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f5b912109169c9b3affcb699c41970d758f6e253 (diff) | |
| parent | 20d6fbd94c3e1061c5180ae12162885f49abc8ac (diff) | |
am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions