summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2015-10-09 17:37:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-09 17:37:44 +0000
commit70bb3f3d43b4e41aa09f085de6dccc00e57e7218 (patch)
tree3ac10e2c83f9de431b09f48c15c83d061f417e12 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent4e33c1c312be549ca155b35b24938076ef30f414 (diff)
parentbc7391d81a0d224a52124fdc87c0ab0cca453917 (diff)
am bc7391d8: resolved conflicts for 93db3d4b to cw-e-dev
* commit 'bc7391d81a0d224a52124fdc87c0ab0cca453917': Retry if interrupted before mMessageThread has joined
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions