diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2019-04-23 09:57:47 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-23 09:57:47 -0700 |
commit | c7204f689dc58c3ac84818cb1f8fb9add307d90c (patch) | |
tree | 6a7f97dc2d7687d63d3da20941dd893f40547adc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2a9ec5525d18d010401943c7b2939d20b309ef1b (diff) | |
parent | 133fe15fc06c7055c5893b8ffb61d9171e3d8198 (diff) |
Merge "Add a timeout for the DNS probe." am: e721b4b83e
am: 133fe15fc0
Change-Id: I01d3e82828ccba060c35cc34c0f28c0535ed4ac7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions