summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-09-22 22:30:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-22 22:30:27 +0000
commit8a0bb0b0e9f01a75b40031e8f3ec1f3e196317f9 (patch)
tree31c2c2311fafcd4ef94655692fe0b71af51bbd34 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent4d3bd53d563369b408700e406d647e09bcdf70fb (diff)
parentef8196c344e13fa3d8b7596ced036d6782e244bb (diff)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 553961fbcc" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions