summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-16 23:40:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 23:40:28 -0700
commit92f2512e41209e21ad8cfaa6c45451ceb964c59a (patch)
tree5469f303810b7d4acca9770c9904c8d2f53a7148 /opengl/tests/gl_basic/gl_basic.cpp
parent9ebbaec7085d667c8b3eddac335dd7fb33996bc5 (diff)
parent38c55b608000c20a0939ddd62a8125dccd715f67 (diff)
am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp * commit '9404e633a55cd325b57732cdd776053b3886b611': Add timer to SIP session creation process.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions