summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-18 15:17:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 15:17:12 -0700
commitc0bc4a3976095ea9efe48bb557953423afaf7a41 (patch)
treeccc2e69bb92259cb595ebc0359809599dcc39cbe /opengl/tests/gl_basic/gl_basic.cpp
parentcd7063515e48f44255f25c9de630be531e0e7222 (diff)
parentd88671ab8cf6c54ecfcb826fa3db58e9a96c8541 (diff)
am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp * commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5': 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