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

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