tree 8aeb6c4b6f24f4eb72597642315c49caf0014aed
parent 0119ba5bd3335fe026927eeb65de535a7bd8c838
parent 8a9a931fff2d184f7cf77fdd8a425f682f006cfd
author Andreas Huber <andih@google.com> 1279734105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279734105 -0700

am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread

Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
  Support finer seek control on MediaSources.