summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-05-26 11:38:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-26 11:38:24 -0700
commit966b5f90554d28c2ed3985f3ec5f44249be4f454 (patch)
tree3f35a3c214429d18476e99d7bd0c04e957a67efd /opengl/tests/gl_basic/gl_basic.cpp
parent31c9c2f91e19371323bd4b5e93d735ccf275a3b3 (diff)
parent446b40091002bc2fa8dc98071f2ec8c39e30bce1 (diff)
am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3': Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions