summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-27 10:34:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 10:34:56 -0700
commitd03f163cf91120cf1d8afe3321219f290952d866 (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parent0f6ded9a6a3ddd91069dd02d6d271ebd426684ae (diff)
parent4ab6241a8ed9510d404139a4d6e99d7a5e1d673b (diff)
am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp * commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4': DO NOT MERGE Text selection: tapping on selection opens context menu
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions