diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-16 23:54:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 23:54:39 -0700 |
| commit | 8b9fbb92327f72d4b3f12a78a6c4f7f7957ae014 (patch) | |
| tree | 14edce3ac206fe1263a48c8e8fc5a71510d5a351 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0c32b2e1862b5d6be71a3123ed2e9bcb2d918ed4 (diff) | |
| parent | 3fcfb4e68bdbac5282fae1b710f5f60481f4c3ff (diff) | |
am f3f822ed: am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
Merge commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d'
* commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d':
Fix sim-eng build on Hardy
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
