diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-29 11:53:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 11:53:07 -0700 |
| commit | b5327a4ac088590eeb7a45dcf573d31e1b38deb2 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b93f6bad12d59e731cc03abb28c7c2c796e7e7e5 (diff) | |
| parent | 4c4d71422568c3977c0f718728d5e305d1b317c9 (diff) | |
am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp
* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
RTP: Revise the workaround of private addresses and fix bugs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions