am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1

* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
  audioflinger: fix noise when skipping to next song
tree: 21c7b8f7009e4213b2567900f430dea48c353da6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/