summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-19 09:55:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-19 09:55:39 -0700
commit2659f40403a7927ff421cf084f3b8e8b3e763ce9 (patch)
tree4afc4ae360009933b125f1c83294af7beb4e2049 /opengl/tests/gl_basic/gl_basic.cpp
parent7a505628df198a5594038731e3bf436d9ab59de9 (diff)
parentc0bc4a3976095ea9efe48bb557953423afaf7a41 (diff)
am f2c40603: am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e' * commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e': Fix bug where home presses were not poking user activity.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions