summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-08-26 00:10:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-26 00:10:19 +0000
commitcb6f2eeb33ed47d8e31e5c8be4783e6bcd91a3b2 (patch)
tree0337c00afc90c59498b0ff23c528b207c93269da /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentd5be8af09392b0e607dd1481ccc90d584b9b250c (diff)
parent148acfcb45065d131bfc022257dc51ec184679d6 (diff)
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev am: 555fbf30d2 am: 12a668fde8
am: 148acfcb45 Change-Id: Ibe0fde1e075d9153ed4a224fb6584f29aa4f649c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions