tree fa9980169c3a61a355714df5f4a5f96a26944d62
parent d2975a1e05db3d569b64e81eb34a406ab956a6f9
parent 0f77bbece9c144f43b04decde5f1c8ad478f087e
author Andreas Huber <andih@google.com> 1281028410 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281028410 -0700

am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread

Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.