diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:45:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:45:31 -0800 |
| commit | 214ecffb0e2c4746f7befc6c875287048af8e360 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e4f599a180a5a15fd5048b812f2c71d80dbb5511 (diff) | |
| parent | 193cd4f84dbec0de4c267d89ec788ba012287f93 (diff) | |
am 1fb2a6cd: reconcile main tree with open-source eclair
Merge commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp
* commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f':
android-2.1_r1 snapshot
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions