summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-12 12:44:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 12:44:27 -0700
commit8dbc26622419821b3e56e565b22f50f2ce43a680 (patch)
tree12283462dbf86ce6f21d9a4d5e7757639be0e371 /opengl/tests/gl_basic/gl_basic.cpp
parente4582835f0732a24dd14324e895d373d598d7fe0 (diff)
parent049570cbb11de26deb205d6c56f6bb6cc66e4086 (diff)
am 2a9ae01f: merge from open-source master
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken * commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69': Corrected repeat count for key repeat in input device.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions