diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-07-16 07:57:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-16 07:57:54 +0000 |
| commit | 82b734c1bcae4232c483365bb92bb2ff317dc2f6 (patch) | |
| tree | c6cf54c5062890cdf148a4d6dda8370c91346cd5 /rs/java/android/renderscript/ScriptC.java | |
| parent | 080838c0a4cc9ea070346e9fc7e4d9265946f027 (diff) | |
| parent | 9795430095feba4b150febeba7d55619f9730020 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev am: a77bc91b55 -s ours
am: 9795430095 -s ours
Change-Id: Ib1530bbebdbfbeeb82900e2f1dc7bc08498da6ba
Diffstat (limited to 'rs/java/android/renderscript/ScriptC.java')
0 files changed, 0 insertions, 0 deletions