diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 10:22:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 10:22:00 -0700 |
| commit | 2bbb5c35c1c0c6c274229c3c9c7f40f95456a91d (patch) | |
| tree | cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a81e01a111d7556d820672649051ad89ce7a6da5 (diff) | |
| parent | 7e7703528ce32e00393cbb325dc2d06100b75a17 (diff) | |
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
Merge e57aa434 from honeycomb-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions