summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-04-08 22:50:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-08 22:50:46 -0700
commit43c201af0dbf9281cf07924662cafd422e5f140a (patch)
tree35e6f115443cc318474db8070cf937cc242fe48b /opengl/tests/gl_basic/gl_basic.cpp
parent32d531269b1eaa04808fae262549e403fe4884f9 (diff)
parentbe819eed4706f3cce82fac0f314559f1e89629be (diff)
am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
Merge commit '3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken * commit '3895007d523a9d5c92b971908f898f19a8c9f8ff': Adds back the finalize method on the replaced Paint class.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions