commit 4e5bc9b4367da37c566e7eaef581f7dc52751bb1
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 6948868fce1e6ea9301a77e49d9880f8df2e7449
parent 89b3eb6905daccfae867d391c742f3269a048894
parent 009bc61b9afd7e9b86c7b0df72eb02357800c63e

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.