tree 1bcac8f1f6bc33a9a7d420a291a5f76a42b022d3
parent 07c34a59fee02ab0732e84a2e2ff3b928de50ebc
parent 3a20f9af8587d2e5bbf4654a3a958f43c4133445
author Eric Laurent <elaurent@google.com> 1394263721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394263721 +0000

am 3a20f9af: am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev

* commit '3a20f9af8587d2e5bbf4654a3a958f43c4133445':
  AudioTrack: When paused, return cached playback position