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

* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
tree: 6c197768a42fe2aa06bafaf2d3e290400de0f671
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/