tree 46c8236b1b45d680f2ca34e3fc639f93729bc57c
parent 4669a5d2783efbd30a0fa32cf22185f61c3d1215
parent 10779b12eec870f428345d192f200dd0a7ad40bc
author Glenn Kasten <gkasten@google.com> 1378831335 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378831335 -0700

am 10779b12: am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev

* commit '10779b12eec870f428345d192f200dd0a7ad40bc':
  AudioTrack.getTimestamp() return type is now boolean