diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-27 12:37:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-27 12:37:22 -0700 |
| commit | 75ef31976e3fdaa3bbefac89843a6ea3b354bca0 (patch) | |
| tree | 2b81f265d998cf1618633bf8cda24704fa4990b9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1a35e612e4f774c0e775f75740799978508292af (diff) | |
| parent | 9eae957207c016db032819eadef261addf994a0d (diff) | |
am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken
* commit '9eae957207c016db032819eadef261addf994a0d':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions