diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 11:37:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:37:01 -0700 |
| commit | acfbfbc079f29a640aee20655831a1338bcad312 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f0747bc6ea1ba8cfe47aa3f19135271b4abd964 (diff) | |
| parent | 124eb84c5ef018482538fac2912a0fdf29b14567 (diff) | |
am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
Merge 6f2fb570 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions