tree 6c197768a42fe2aa06bafaf2d3e290400de0f671
parent ab8aa6aa0a71884406f9d79bcd0cfdc717995bb3
parent ca0928da9afc905e62e4bdd0e283d223db786978
author Eric Laurent <elaurent@google.com> 1331935304 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331935304 -0700

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

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