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