summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-04-10 11:41:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:41:54 -0700
commit0bcb08c19f5551dc4fe1d6289ddc530ace31bb9e (patch)
tree3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp
parentd579d794a791ff2d33eb8317f0d2b1dde08c9b96 (diff)
parent3d436720d270ecd4490bda7f80439b3b331e7da1 (diff)
am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo
Merge commit '4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp * commit '4525c98114c1e570ecef84521f66095e866af77d': Fix regression introduced when fixing focus issue with ScrollView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions