summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-05-27 11:29:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-27 11:29:46 -0700
commit21aff54036a6d4e74c8611ab1bcbf8ea5c336a8d (patch)
treeb2e51ea79ac3fb83fa91c0e9906817eacbd203cb /opengl/tests/gl_basic/gl_basic.cpp
parent379e889afa9966197a838e2bc884160b66f96770 (diff)
parenta3eba24fdfedbfdce9cf707d30fb0304a92f8091 (diff)
am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '95f397adb13aa69b15b53bb089078d4dbdb269f1': Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions