diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-28 18:56:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 18:56:17 -0700 |
| commit | 81877d0fdad84fae9d40bd027b1d9742d6a1b9ff (patch) | |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 80543fa0e9cb0bb65f0c1de8ee47ab0652178f60 (diff) | |
| parent | 691580c6bf001e7a87bf2f6ddc80342decbfa12a (diff) | |
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
CherryPick 988eeeb5 from hc-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions