tree f319a10628680be392d150b3b3798fe4dee752c4
parent 5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5
parent b231408849158baea8dddc0edf7e97fcfc2e3240
author Lajos Molnar <lajos@google.com> 1399053681 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399053681 +0000

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

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