commit 009bc61b9afd7e9b86c7b0df72eb02357800c63e
author Andreas Huber <andih@google.com> Tue Sep 28 13:26:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 28 13:26:26 2010 -0700
tree e3fe56f3a9a380af64cd06de2c2cab32a08165a0
parent 24bf6aa6175c3a657799b5f9db80d644267fd56a
parent a29b78b612d4f3fb0704e100f97f74c79e16977a

am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread

Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.