summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-10 02:23:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 02:23:04 -0700
commit1444db6448bad613501a9fb6e677ba0cadc9407a (patch)
tree3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp
parenteb7a4298e6f508379afd33daf67db2845e44f373 (diff)
parent0d93a6efbc9111a1e71ca474e9dcbd59bf887275 (diff)
am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread
Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp * commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680': SIP: add SipErrorCode for error feedback.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions