summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2016-05-27 03:14:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-27 03:14:22 +0000
commit257c5b2e9ce5969e22c88d84213f394953740c64 (patch)
tree004489aca086ecc95a16fc3d4f4471c2959bddb3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent4f34e793b3359b9b880f539680a43a7d937a1983 (diff)
parentfdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c (diff)
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e
am: fdc53e96d3 * commit 'fdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c': Don't pass URL path and username/password to PAC scripts Change-Id: I75e1b139492cac12bf73fa68894f2e7ae7deb701
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions