diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-16 23:44:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 23:44:42 -0700 |
| commit | 0c32b2e1862b5d6be71a3123ed2e9bcb2d918ed4 (patch) | |
| tree | 1f599e9e32379c36aed14530a3280de50c92f3cb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8f38108cc6e6a6b06e5491e38bdad82f6d4f7c81 (diff) | |
| parent | 92f2512e41209e21ad8cfaa6c45451ceb964c59a (diff) | |
am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'
* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
Add timer to SIP session creation process.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions