diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-01 18:32:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 18:32:03 -0700 |
| commit | c493b5d36817d8bb64238502c230d2819c4b8ccb (patch) | |
| tree | 97123b17951d0a5f259f029b02e02a9b8fca8fb2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | daaa92a19f70f26e40bb7337a352bfa09e92cac6 (diff) | |
| parent | db193288b23381f8ee9938e53015e31395bc2cd4 (diff) | |
am 306137d9: SIP telephony cleanup.
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp
* commit '306137d97f40a4f807c54a75210343c9262360d1':
SIP telephony cleanup.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions