diff options
| author | Narayan Kamath <narayan@google.com> | 2016-09-08 09:18:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-08 09:18:14 +0000 |
| commit | 90529e01324602a7bece5d37f8ff30dd54f998e7 (patch) | |
| tree | 75a71a2607e3507672ac435b65dc12d101246dd1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2c8aac8c823e0121402e6043a975eeb79fd8df13 (diff) | |
| parent | edabef573887f994a651a1e2220c62d55302350e (diff) | |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a am: c83ca7267a
am: edabef5738
Change-Id: I5e29bcc852b8c3e361ad0c3ba872e8d959ef5717
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions