diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:57:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:57:44 -0700 |
| commit | 222c36322b2f69411c7222cb217f15bbe204e6e9 (patch) | |
| tree | 0b5d35ae7bacd0837b7d778ce90367bed325b021 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ad2eaedd63f842d3b19f024e698713cd07172b3c (diff) | |
| parent | d516c74c42d77e8614fb53fb97161c9f4aeae812 (diff) | |
am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
Fixing self-assignment in cloning code.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions