summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-05-29 15:18:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-29 15:18:40 -0700
commit57d436d4dec99fb3a73815040b40fe447c9f1a61 (patch)
tree664797591be51d29005b6bfb0ac895e4d30620ac /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent452b488c51d99c20ce485207719aabe62419591f (diff)
parent8d25fba83872b1806c6c21569fce7c87b50257df (diff)
am 8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
* commit '8d25fba83872b1806c6c21569fce7c87b50257df': DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions