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

* commit 'eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
tree: ea63205b10fdcc3ad58434ced3204ae940e6f3f6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/