diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-11 13:10:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-11 13:10:48 +0000 |
| commit | eed04347e73b07c7c726453c5931b335ce5f0303 (patch) | |
| tree | b6b90434f3438dd139de07b370e920d9bbb08812 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4d4b9a2ac61d6b0a174c783bd16f3e2fa17fabcc (diff) | |
| parent | d23be95dd7e444e2a223efbc1cddf55e4c7bb881 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am: d23be95dd7 -s ours
Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions