summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-27 12:23:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 12:23:39 -0700
commit2479097ecb899f1e193063e3ce126c721e13c455 (patch)
tree6db0e4efab2651fe8914d9ddecf78931960a7da4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parentd322d16323176ddd5fef3383798176f64d0078c8 (diff)
parentb94493feaf8b7a620a25c23c1f131a999ed61293 (diff)
am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp * commit 'b94493feaf8b7a620a25c23c1f131a999ed61293': Document blocking behavior of ImageView setImageURI and setImageResource
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions