diff options
| author | James Dong <jdong@google.com> | 2010-09-10 11:25:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 11:25:24 -0700 |
| commit | addf68947c5eb5a613808467b124a8c33d7d2e01 (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 10eea1e2774079b9dc9d99f3df6f6f83498331aa (diff) | |
| parent | 425981524ad3925284b2c4ac9c568d77c582cecc (diff) | |
am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp
* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
Fixed a copy and paste error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions