diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 12:01:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 12:01:26 -0700 |
| commit | d17beac1f1d6034e24094b9ca02ba8f4a30ebcc4 (patch) | |
| tree | 0b5d35ae7bacd0837b7d778ce90367bed325b021 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0c28c853fd51c47fdc03870e1ee937f707d103db (diff) | |
| parent | 7f0dbabda93c16b6593fb0b9a88c1bf121baee0c (diff) | |
am e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
* commit 'e8a00ad288e36204cab2ba2407b42525fe2e44e0':
Merge 6f2fb570 from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions