summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-10 02:37:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-10 02:37:20 +0000
commit1838cb9f192181562e1b1049ce50e2b367aba8aa (patch)
tree2a3b47f2293a750e9d984aed7f024b7dfbea1b63 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentff264d07cae23467111c2d3956baf19c013f9ff4 (diff)
parent82eafb9b8fcf0b3ba81da5a8e515f938e01e11e1 (diff)
Merge "Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: e47f682c85" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions