diff options
| author | Paul Jensen <pauljensen@google.com> | 2016-05-27 03:38:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:38:29 +0000 |
| commit | 24c7ed7155b7832bd9297423a4ab7ba6e99d489f (patch) | |
| tree | a832c338df7368dc1095c8b41d91db709aad6990 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 61af6f467b74848dabba9723bf0d2fbb58b0a7fa (diff) | |
| parent | aa98ab568cc3f7cba554b5bdb7fcd70a9b05ae61 (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: aa98ab568c
* commit 'aa98ab568cc3f7cba554b5bdb7fcd70a9b05ae61':
Change-Id: I2f311ce3ddb510f73c3d9e8d08991c8d5bd99a90
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions