diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-15 12:07:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 12:07:43 -0700 |
| commit | 96adfac1f921d6d78b0bd5bc4d3e9602bd78a982 (patch) | |
| tree | 0b5d35ae7bacd0837b7d778ce90367bed325b021 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73741561d6d476dd24542b6b29e7dd972ee92278 (diff) | |
| parent | 7d449d205ce454a5449bfae83e271e3702f322f6 (diff) | |
am 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
* commit '9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12':
Merge 9d76581f from honeycomb. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions