diff options
| author | Chet Haase <chet@google.com> | 2010-09-21 13:46:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 13:46:05 -0700 |
| commit | a766851582ab3cc57770f246892f049b1f165579 (patch) | |
| tree | 7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ad1674e06e962158485d01bf712e158d08645092 (diff) | |
| parent | 18f159fb99339ce16df47ff822072e7a21263347 (diff) | |
am e920477e: Merge "do not merge" into gingerbread
Merge commit 'e920477e862b90778cdc8e2e221a20d8f3a86878' into gingerbread-plus-aosp
* commit 'e920477e862b90778cdc8e2e221a20d8f3a86878':
do not merge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions