summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorCostin Manolache <costin@google.com>2010-05-12 07:55:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:55:32 -0700
commit7d3262c5baeafbf1d3049bcaf9e8e46395e6f9c6 (patch)
tree19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp
parent9496e90287b7cc76296970af52637425d8c20af1 (diff)
parent884e624b3aa9dfdff93a7043927fa502d67c6e7c (diff)
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken * commit '625de488973f262e56d3ee6825a8cf1ebaee089b': Bug 2673557: rename datamessaging
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions