diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-22 22:29:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-22 22:29:32 +0000 |
commit | edeefb0d58a4fb8fdc00522a847034a90eb1d20c (patch) | |
tree | 379fd80a57a4faab52fa52382a74899c2324220a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1a2973baee95577e49a8bd87f4a970e24542b855 (diff) | |
parent | 7ee9869ac659afd51875c0c6bd6375db674b25af (diff) |
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: fe3e7b181b" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions