summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-28 17:37:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-28 17:37:50 -0700
commit5d20f854a61d6da91118236bcd91dd9a3143be50 (patch)
tree6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp
parent4e5bc9b4367da37c566e7eaef581f7dc52751bb1 (diff)
parentae3a02e07f614d0282cad7c0e89c83fd38e89074 (diff)
am 7d6f864f: am 65a5ba45: Merge "Fix bug in split touches." into gingerbread
Merge commit '7d6f864f9ee66035bab98e61e9947d2389f1f341' * commit '7d6f864f9ee66035bab98e61e9947d2389f1f341': Fix bug in split touches.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions