diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-07-19 10:25:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 10:25:22 -0700 |
| commit | e53033d6c54316a028e10dcf980760882a43ee01 (patch) | |
| tree | 6c5e8d329134a56c5ff40a87a3ecf1325a0720b0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 10880164d70eb9267f9941a0d681eaefad05fd8c (diff) | |
| parent | 32afe04a54a66d477c232fa21300fc350636fa50 (diff) | |
am 0a0bb953: (-s ours) am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '0a0bb953f0198e738e3e15a869af21a66a442466'
* commit '0a0bb953f0198e738e3e15a869af21a66a442466':
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