diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-12 07:25:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-12 07:25:10 +0000 |
| commit | d7647c938a5f6557eb823cb7ea187e7025c318c8 (patch) | |
| tree | 597880ba4c619f34746da6826a469d5d087bebe9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1fa5d57942362885919c255adcf2b4ebb5923a55 (diff) | |
| parent | fc24e1c5afca4ef6add3f2f0386675a6481454e9 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp am: 3425a6e5c7 -s ours
am: fc24e1c5af -s ours
Change-Id: Ib8317ac06817ad70f8883d97c98b94b4911b3577
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions