summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2010-09-21 14:08:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 14:08:55 -0700
commit868fca7d002e794d8f280ebb9d33f4170a8fa7d9 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parenta766851582ab3cc57770f246892f049b1f165579 (diff)
parent13603aaaef611d888fa72114649aaf62a6a230f8 (diff)
am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread
Merge commit '1139b326d2cf95e2917ed23d79f795d64379d188' into gingerbread-plus-aosp * commit '1139b326d2cf95e2917ed23d79f795d64379d188': DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions