tree aa81bf2f908a938a69b2186635e0c3154df77777
parent b388138ff2986d6883fa9331fa91ae5e18ae81a0
parent 2a0d685ed62ff7a5e5a40be0748860c092165984
author Eric Laurent <elaurent@google.com> 1331943984 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331943984 -0700

am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1

* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency