summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-02-03 18:42:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-03 18:42:08 -0800
commit886fab76a651ed639ff5f24cb60ce59fd4c92653 (patch)
tree0b8accc2d5b58e5121e60ec38a0a2b829f266455 /opengl/tests/gl_basic/gl_basic.cpp
parent1b569b3ad222d6481fab5467369d3363a852953f (diff)
parent3592cdf075bf5569373c0289a90397dfffeb45f5 (diff)
am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
* commit '0d47ac11764b89431777c3a84efd5fa9c17130dc': Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions