summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-16 17:29:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 17:29:23 -0700
commit58fc6e51ad887bfd2124efd41f9f1584e07f4422 (patch)
tree78b5238113b33b0b9c68c36e4a8562b08e3edff6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parentb6f349adaba0efbd7c34b5d41a71f24c4e8c95e8 (diff)
parent23c6ad7aedecb5bc4be9ed61c2550c43715b47b0 (diff)
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)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions