tree 06bbd40083a1bfe3694b0ba46f58f71878d9c2b4
parent 779396a12b710d99ceec5baee24caa6a9b12deb3
parent eb32ea5cc839681209219f4ecd4426a37e2ef5b8
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.