diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-14 12:05:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 12:05:41 -0700 |
| commit | 3a0babc10ba1f10d59377096e1bcdfe09de0eec3 (patch) | |
| tree | 6d362a266557b90295fa9667d58c8e4325085dd7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 50093af2a2cf59ee07380bc3fe5225d11357c184 (diff) | |
| parent | 928595e7f0514b35ff1ac3c04a64c7ab7cc43afa (diff) | |
am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit '179dd46e5de9dd61a9011708d262ca40012e9040':
DO NOT MERGE Backport of I1f55df8a from master.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions