diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-28 18:53:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 18:53:54 -0700 |
| commit | 691580c6bf001e7a87bf2f6ddc80342decbfa12a (patch) | |
| tree | d3ab7b42eae95f1b0ea7b186adf4a1def484babf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73b607f9ce5c91fed6709495c31a5a7878732205 (diff) | |
| parent | 75d0ba1869a95787707fa1a2537670042674dd65 (diff) | |
am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
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