diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-05-27 03:42:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-27 03:42:57 +0000 |
| commit | 7b8a3eeee6744b4b0f6c8ccfe9e53d69ac273f59 (patch) | |
| tree | 3be648bb56b56c95d048ee9b95a9db774138daad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e38bc45687c5dfe4d50a3b37d44d831325d89f0c (diff) | |
| parent | 24c7ed7155b7832bd9297423a4ab7ba6e99d489f (diff) | |
Merge changes from topic 'am-07760a7359434d758da865299f519df1' into nyc-mr1-dev-plus-aosp
* changes:
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
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77 am: d8e548f6ea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions