diff options
| author | Narayan Kamath <narayan@google.com> | 2016-09-09 11:01:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-09 11:01:42 +0000 |
| commit | 2089e592ba48b5dadca579ac40afe3142c4de316 (patch) | |
| tree | 7f318f411f155df1408889f78ec9955dc9933f86 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 03264bff5dcb46b548372f88cbaa9b71f788fd47 (diff) | |
| parent | aa9d4135e271918c4e72879b909f77ea5f558f61 (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
am: aa9d4135e2
Change-Id: I6e0b1880edf347cbe5d22efbea2a493941c83c07
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions