summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-30 12:02:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 12:02:03 -0700
commit32dddc87b3a22e69e8b0f70698ca6ed0d2082687 (patch)
tree6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp
parentb76dcfcf446a3636e051a181281c25e660bd705b (diff)
parentdbe52c0a08b30cc8808a76a2a962ef2059be29b7 (diff)
am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71' * commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71': SIP: misc fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions