summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-28 11:32:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-28 11:32:38 -0700
commitb763a6dc41dcce76585c56657903ae72c5422ae1 (patch)
tree0a83501447a4970cadef6745a6e07b34c27cbd74 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent6db6468956fa6d71d68e410a532ed7b1bcaecf74 (diff)
parent08cf57d791e50ecafe2728a7617a6487aeb6d6d5 (diff)
am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp * commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5': Fixes to granting URI permissions - take into account path perms.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions