summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-02-07 13:48:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 13:48:17 -0800
commit03cc6db14181219acf8b2f86279f5db2fff39e62 (patch)
treeefa5facc8ad5b4fbe0e450f0b8bbb09f38c93530 /opengl/tests/gl_basic/gl_basic.cpp
parent92d7dae32f0fc3e44ee227641de4b86c23753013 (diff)
parentec1cae6daa179a9e86723ecbcfad441fc3c0dd70 (diff)
am ec1cae6d: (-s ours) am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
* commit 'ec1cae6daa179a9e86723ecbcfad441fc3c0dd70': SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions