summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-04-10 11:54:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:54:36 -0700
commit223dd73ef199f85a1072a06327b4821636517d6c (patch)
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp
parent789d8f3aae1c356c171ed3f23663d0fe10a616dc (diff)
parentdac67195b9d9bb1265f3e5736d2b5ff29923e4fd (diff)
am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions