commit b91d92d7147c10dd19987706d30dea011ff459af
author Andreas Huber <andih@google.com> Tue Sep 28 17:37:44 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 28 17:37:44 2010 -0700
tree 573489126efb8881196f63fe5f8fb0f2d8b42536
parent fb9b87b6c22d940e5e7cb4b5e7cfae99015a0131
parent f4d14086206af57fa2d0144e94124fa73be84968

am 387bdcda: 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 '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'

* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
  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.