tree 3767eab29e056c723861085fd8e7c0fa6ef2a336
parent 113f2122662856f2482836f1b4c585a050888afa
parent bc4bf532b7581ecb1c8734a63742183c3ecb02c5
author Lajos Molnar <lajos@google.com> 1399053862 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399053862 +0000

am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"

* commit 'bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
  AwesomePlayer: use PTS for queueBuffer