diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 11:36:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:36:57 -0700 |
| commit | 2f0747bc6ea1ba8cfe47aa3f19135271b4abd964 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fe95159c8e68d4b1f5d3af771595edb7c44bda32 (diff) | |
| parent | 1d0284b613fa5fa694d7a8928e611bc696d8bc74 (diff) | |
am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
* commit '14e1f523c673315cbc3167448ce9252b455d252c':
Merge c12b4093 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions