tree 777b60e6465543ffa83b48dc80ffcdc5f66b256e
parent 46240800f19b11bb3635a1d8c00a5c7584c0e556
parent 85603a7faf0a8067803ae6424bc590f6e2a17e07
author Chet Haase <chet@google.com> 1416442070 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416442070 +0000

am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev

* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
  Fix seeking and scaled duration behavior