summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-19 09:11:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-19 09:11:17 -0700
commita77234f10e165d634840e65feb60698612dc1c4b (patch)
tree6c5e8d329134a56c5ff40a87a3ecf1325a0720b0 /opengl/tests/gl_basic/gl_basic.cpp
parent4ce17a8e241b5560e18d6424084d5b6fc5caa410 (diff)
parentcc0820bfcdd0c0d6c6114f386564fcd21c79b4df (diff)
am 3d02b48b: merge from open-source master
Merge commit '3d02b48bd95293c767563729264f007dbcff82b3' * commit '3d02b48bd95293c767563729264f007dbcff82b3': Fix the layoutlib Paint.set(Paint) method.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions