tree 5e7501642f232712e9c4da0f5280e65b4179f89b
parent edf6131d1eca1fdff3b151805d241a1cc81b52ca
parent 6e76fda36a87e154397de816fa091b721a4c11bd
author Lajos Molnar <lajos@google.com> 1399051082 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399051082 +0000

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

* commit '6e76fda36a87e154397de816fa091b721a4c11bd':
  AwesomePlayer: improve scheduling of video event to hit PTS