tree e44a9222f8a53d8bafecfa4fad9751e557134a8d
parent 37abeed739cfc859faf4c31904a5026473b12748
parent f8659dd62b780abc94d9e78ac6e0e1dd378d8968
author Andreas Huber <andih@google.com> 1287126515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287126515 -0700

am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread

Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
  Some webcams output rtp streams but never send any rtcp data in violation of