diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 11:57:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:57:30 -0700 |
| commit | 47b876d150ac6ae44253e5c51a92441fe8e6753c (patch) | |
| tree | ad3cf2304e44d77a583ac28ff560bf9310fffd1a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d516c74c42d77e8614fb53fb97161c9f4aeae812 (diff) | |
| parent | 2f0747bc6ea1ba8cfe47aa3f19135271b4abd964 (diff) | |
am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
Merge c12b4093 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions