tree 4642f107bc46553e6137d51280e09c44a975ba95
parent c09cea3931bfd61eb0fee7eb09f51ede27212722
parent 549629d36690ac09498d0a9b2aac4ae4ceb7eead
author Andreas Huber <andih@google.com> 1284678145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284678145 -0700

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 '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp

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