summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-01 17:08:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 17:08:34 -0700
commit4adce423e481c50b0dad1d1e2bb52c909bb5bd89 (patch)
tree43089c79fd7acffc6c480a2ce0bbf7f15dcd163a /opengl/tests/gl_basic/gl_basic.cpp
parent58addfd94b84525c6cb277e6a14959a0a3f768c1 (diff)
parentbd432d461952c3035032805f3c50ed34c1f51c4a (diff)
am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f' * commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f': Support haptic feedback for virtual keys defined in key layout.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions