diff options
| author | Scott Main <smain@google.com> | 2010-04-16 16:17:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-16 16:17:55 -0700 |
| commit | 65db994ad304ea34d3baf7552e9918f1de00b949 (patch) | |
| tree | fcd455d88c532282c943e64fe131b47e7eae1600 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4a7c89014ba9b64552532f8c70687a5908e988fc (diff) | |
| parent | f3401a3e85ba408f5f967daa394bdd739513fc0f (diff) | |
am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo
Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp
* commit '0df87c0653fc9e8425643a10cd71594a962fab8d':
cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions