diff options
author | Narayan Kamath <narayan@google.com> | 2016-09-09 10:52:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-09 10:52:34 +0000 |
commit | aa9d4135e271918c4e72879b909f77ea5f558f61 (patch) | |
tree | 4921d23af473fa686666d3e93a07e363e4bafbbf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 054652839b4ecc5e2b47201bbfc20ba37d88509e (diff) | |
parent | 19ebec6d36d3f3c3cd674c31db43bfa6b7956d15 (diff) |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf
am: 19ebec6d36
Change-Id: Idd19bf7d29385fabf759fed58d8897b5392d4d81
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions