commit 347d3c1dabd7ae9c998a024c685de2001e0ff369
author Andreas Huber <andih@google.com> Wed Aug 04 14:15:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 04 14:15:23 2010 -0700
tree 87f5d0d68c1779f113843e939c41440ff6b00389
parent b9ad87ca9a18e28436e8634e95d9715b32b07faf
parent 39ddf8e0f18766f7ba1e3246b774aa6ebd93eea8

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.