tree 4db7bc90964226796b53d3092b6f1ad00a769992
parent 627c790c1f7c8fd44dc50abb03885aa5a075d418
parent aae7b2274a1521a1a82bbe560e03a046d116bb40
author Andreas Huber <andih@google.com> 1282697772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282697772 -0700

am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread

Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'

* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
  A first shot at proper support for seeking of rtsp streams.