tree a67218cf464634821e0f98060da0ed07605fd8b5
parent 192d6a509cf609a2a4b7f9cb70aeb5daabb0204e
parent 9e0922ba7dda72fc94d2af2872cfc630ad599c91
author Lajos Molnar <lajos@google.com> 1399051313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399051313 +0000

am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '9e0922ba7dda72fc94d2af2872cfc630ad599c91':
  AwesomePlayer: improve scheduling of video event to hit PTS