diff options
| author | Andreas Huber <andih@google.com> | 2010-08-04 14:15:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 14:15:23 -0700 |
| commit | 18822aa0c1a13f79340fadd7e9df0bf57eb6ac2f (patch) | |
| tree | 420413d5210dccca6711259b895d393b733c42e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba1b3fa4564584591ee327350db48d9f8743a94a (diff) | |
| parent | 71f8931bdd7e19f78a1a5a559a4d4fa896c454b8 (diff) | |
am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions