summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-05-17 10:07:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-17 10:07:23 -0700
commit6ff4b143850fe8d6f30ed1447e9277fe37653790 (patch)
tree5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp
parent5cda4179f0b5df797d5eccce35c305bd37787306 (diff)
parentefbd4e9e7a809fe75fce571ac9b0ef0328e1ff96 (diff)
am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3': Turn fading edges back on for ScrollView and HorizontalScrollView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions