diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-24 02:57:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 02:57:37 -0700 |
| commit | 69a54910a3f041e108dc847f16be5ded186c3d0b (patch) | |
| tree | 228f1924ff66bb350c9ca06f4346110b5edaf9f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 15498dbaa1005b24b10463c2e3faff040baf9fcc (diff) | |
| parent | 2bbb5c35c1c0c6c274229c3c9c7f40f95456a91d (diff) | |
am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
* commit '46e802e9c12befcd477e59437c5de3f0889aef4e':
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