summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-28 17:37:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-28 17:37:04 -0700
commit89b3eb6905daccfae867d391c742f3269a048894 (patch)
tree6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp
parentaf3b2ca6d4912ec8ab01ee8503a1825ebc40ec5b (diff)
parent24bf6aa6175c3a657799b5f9db80d644267fd56a (diff)
am 0d447760: am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0' * commit '0d44776016cecf1c7c826c4784f8f867a56235f0': SIP: Feedback any provisional responses in addition to RING
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions