diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-08-26 01:17:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-26 01:17:15 +0000 |
commit | 6eaa44141c314b147d2553e76c7ac5d1f9e8102b (patch) | |
tree | 2e8c0a664918a50b177b60544b147f72d62d73c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 812e3552894a6fd51da7bfb75bb450486e9d3746 (diff) | |
parent | d5be8af09392b0e607dd1481ccc90d584b9b250c (diff) |
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 am: 6a9490f850 am: 380d9b9486 am: ea35f92f98
am: d5be8af093
Change-Id: Id72d3b9599a2effa92f49fd0b1ea254a95414efa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions