diff options
| author | Christopher Tate <ctate@google.com> | 2010-07-29 14:04:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 14:04:07 -0700 |
| commit | 8aea3f3b94e14b5f8b9ca288ddaaeaf7d7d8898a (patch) | |
| tree | 559eeaf0eaf27408699d5b846e23649297ceb8f6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7246da1866cc434525075fc17472591941ec2782 (diff) | |
| parent | 8ec5fac78639d4074858d587c1529ba4fae9c43f (diff) | |
am 06abd0a6: am 571180c4: Merge "Attempt to fix the SDK build" into gingerbread
Merge commit '06abd0a6a833beda1c0e68aed44912d145745a42'
* commit '06abd0a6a833beda1c0e68aed44912d145745a42':
Attempt to fix the SDK build
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions