tree 9328d0a0984226824c21559eaf571af1f7f4f79d
parent f41d9bc92410784fc12fa15a544282c06da76008
parent 586dda1d0845612af88e3f4ffc46ed38e304ef85
author Marco Nelissen <marcone@google.com> 1389290053 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290053 +0000

am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"

* commit '586dda1d0845612af88e3f4ffc46ed38e304ef85':
  HLS: Fixed rounding error with decimal segment duration