summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-09-14 09:43:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-14 09:43:46 -0700
commit55711d5b9ce047106dd3127cc78fe8fd0012ff9f (patch)
tree1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp
parent16a1e21491d6f42c5c88e775a9cb7c164f7e8d76 (diff)
parent9ee8b4325f127364bb95f4c85c0384bc84ea5839 (diff)
am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp * commit '5dde95b8fe0fea1a115a68f8acf826371da89da7': Fix the bug of authentication in an outgoing call.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions