tree 6332f0c4ad21911631ef7040501e510f921bd577
parent c5845f94c48b6254d6b4427911a01e734e263cf9
parent 5431564fc412bc159d6afcd2cdc52ac6fb9e4a56
author Eric Laurent <elaurent@google.com> 1339616107 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339616107 -0700

am 5431564f: am e773281e: Merge "fix AudioTrack testPlaybackHeadPositionAfterStop()" into jb-dev

* commit '5431564fc412bc159d6afcd2cdc52ac6fb9e4a56':
  fix AudioTrack testPlaybackHeadPositionAfterStop()