diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 16:02:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 16:02:25 -0700 |
| commit | 23c6ad7aedecb5bc4be9ed61c2550c43715b47b0 (patch) | |
| tree | 4642f107bc46553e6137d51280e09c44a975ba95 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c09cea3931bfd61eb0fee7eb09f51ede27212722 (diff) | |
| parent | 549629d36690ac09498d0a9b2aac4ae4ceb7eead (diff) | |
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)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions