tree 78b5238113b33b0b9c68c36e4a8562b08e3edff6
parent b6f349adaba0efbd7c34b5d41a71f24c4e8c95e8
parent 23c6ad7aedecb5bc4be9ed61c2550c43715b47b0
author Andreas Huber <andih@google.com> 1284683363 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284683363 -0700

am 23c6ad7a: am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread

Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0'

* commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0':
  Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)