summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-07-19 10:22:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-19 10:22:59 -0700
commit32afe04a54a66d477c232fa21300fc350636fa50 (patch)
tree84f9ae1e55b173a9692d2868c7d1a956b7c47de9 /opengl/tests/gl_basic/gl_basic.cpp
parent07b9d4c5dea22ae74cfb51017eda7e3ab50e0bb0 (diff)
parentb04f72e6099ef386455e53c20a383fe6935e7934 (diff)
am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp * commit '80e62ac61c297452c003919f71c4dcd7063d1b43': Fix the layoutlib Paint.set(Paint) method. Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions