diff options
| author | Erik Kline <ek@google.com> | 2016-12-12 08:48:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-12 08:48:21 +0000 |
| commit | fa496209d02fd38f1004878e1ceb68335a6a6eb9 (patch) | |
| tree | 0590820a69c4ac10ff5b6d55dfa67248b8164e5c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ffd4583e175f16a8d2bc6abeb676bbeb4dd8b03d (diff) | |
| parent | 841cb621fd3f92036de1367c245f9b20512d905d (diff) | |
Merge "Stop setting net.dns{1234} system properties." am: 7552e2de9d am: c715ea8458 am: 54c56de832
am: 841cb621fd
Change-Id: I63216568d2ec5606fdfe108d0263714238dc1886
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions