commit f4d14086206af57fa2d0144e94124fa73be84968
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 45f5aad814ca406b0d5eec12b8f10d1852111351
parent 10d64915079bfb316a3949fe7fa35dca37a92af4
parent 036fad5034d05beecae19da6da46e1ce7be78e64

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.