summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-08-27 08:17:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 08:17:02 -0700
commit8c7738865cf1b6b9dc1a786aa2f76e259ae7d77b (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parentbbeddcd4b9aa5b8963ba6e953124aac784e2ba34 (diff)
parenteb61092706ee7ed0897070b78a6b3cd5a1a0fc5e (diff)
am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp * commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c': DO NOT MERGE copy selected text on tap
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions