tree cb0cd7d78276aa28bbd780e5ccbacf08cd688eb5
parent 999c78d17f635e93f10fbad0a83cdfb4f41228f2
parent 0ac53364b79dc72ee0c09f0efc46a22ab4374dbf
author Glenn Kasten <gkasten@google.com> 1402531421 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402531421 +0000

am 0ac53364: Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev

* commit '0ac53364b79dc72ee0c09f0efc46a22ab4374dbf':
  Fix non-monotonic AudioTrack::getTimestamp after pause