diff options
| author | Wei-Ta Chen <weita@google.com> | 2010-10-01 12:36:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 12:36:05 -0700 |
| commit | 75d25a5acd885d9dad3da05032810d9b35d605ed (patch) | |
| tree | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0a65d84933655095b0cf587a847dbcf8674f1a1c (diff) | |
| parent | c264c38e1935c5b13224853422c543b79bf805bb (diff) | |
am f7681f84: Do not merge.
Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp
* commit 'f7681f84918c27f6a626681ce37ed2a236c44e82':
Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions