tree 1812609b8495f81da7c7ec9701f8cc21fb72b6e4
parent 14bca94708363f3a22d741aad9e63132e903397e
parent 9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0
author Oliver Woodman <olly@google.com> 1372754036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372754036 -0700

am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev

* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.