am 23c6ad7a: am 549629d3: Merge "Make sure stagefright -o terminates even if...
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 '23c6ad7a'
* commit '23c6ad7a':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)