diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-04-11 17:11:41 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-04-11 17:11:41 -0700 |
| commit | f2ab6bc15faffc75bd6fccc5194df92acdfff294 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b5acb8d716968a39866ac308bdff50eb5c30688d (diff) | |
| parent | 44ce4d44540f2b808315c496118a1fef71de8953 (diff) | |
resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions