tree 4f082b56d0d796ee68fff07ae31f6354418b0bb7
parent ce5b9c2399c565a160cf0e9f3cdd7b4a7000b498
parent 02e1c6fe23c6eb79e0618d218bce647826a1ac0b
author Eric Laurent <elaurent@google.com> 1321289029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321289029 -0800

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