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

* commit '02e1c6fe23c6eb79e0618d218bce647826a1ac0b':
  audioflinger: fix noise when skipping to next song