summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2016-05-27 03:04:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-27 03:04:34 +0000
commitfdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c (patch)
tree293838dfb310dcaf5e18797f73621f2addf01093 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent50aa0324c9f425b83b4ca241fb8727033f026532 (diff)
parent50615e498e11f356ef582af0f9616945d04faa80 (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 * commit '50615e498e11f356ef582af0f9616945d04faa80': Don't pass URL path and username/password to PAC scripts Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions