diff options
| author | Andreas Huber <andih@google.com> | 2010-08-05 11:46:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 11:46:04 -0700 |
| commit | 7e10ba6fa9100921b7af506c297bbe20e905ffec (patch) | |
| tree | 30fbfeb62560c8503a6f8e32e9624c129f98c194 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 381160e257559afde9c73bb373d511a6d8728f35 (diff) | |
| parent | 18822aa0c1a13f79340fadd7e9df0bf57eb6ac2f (diff) | |
am 1f513d88: 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 '1f513d8821670a33d6361ea521b6756163a3f9bf'
* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
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