tree e47c535870d06533653c01d2d9b3253fe6c53608
parent 344a1b9bb5cba14a0771c8b416466678aff3215f
parent 63249d6ea560b2f29d3ee255951f527b01ecbac5
author Lajos Molnar <lajos@google.com> 1399054224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399054224 +0000

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

* commit '63249d6ea560b2f29d3ee255951f527b01ecbac5':
  AwesomePlayer: use PTS for queueBuffer