diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-28 12:29:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 12:29:08 -0800 |
| commit | c6a02ff5325e90e264ce3c5811e0e4f39aba2ef7 (patch) | |
| tree | 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5651616a91b04980311e16fb0ca8fccee53dd786 (diff) | |
| parent | 13fbf427210cd5b91e7de9a01c9ab0236df7e333 (diff) | |
am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
Merge 1911a6f7 into gingerbread. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions