summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-15 07:42:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 07:42:48 -0700
commitee37919e76ffa64d7359ef77a1b7539782887586 (patch)
tree1b4d284d76610faa682262216e18d7956df073d7 /opengl/tests/gl_basic/gl_basic.cpp
parentbf7ee96973921a1626d89a91d35d1513cd5cd025 (diff)
parentcccd77aa5b2ec89e2af1db7b4c8c38626dd5ddf1 (diff)
am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp * commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482': SIP: add PEER_NOT_REACHABLE error feedback.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions