summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-03-09 18:31:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-09 18:31:52 -0800
commit7115e796b5fa568c1a240653b2aa8b1d82728514 (patch)
tree1bc863b1fdb0776142dd8a23926118d58836c50a /opengl/tests/gl_basic/gl_basic.cpp
parent58ce180f405ccae726d0543bc99f9b991f17c69d (diff)
parentbbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a (diff)
am bbb5f5ac: (-s ours) am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
* commit 'bbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a': Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions