diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-10 13:53:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 13:53:58 +0000 |
| commit | f6f8090448f8239c27c701ee0ee5b9e06e298845 (patch) | |
| tree | 0a9b13a7464d2fe4814d3f3ef2a28eb402b9b47a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 496623f0ad42ad073bad7a4bf010b4b4c11e84f4 (diff) | |
| parent | 6393105afb1793ba4250cab838dd2e5a6ad8d7c2 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours am: ae62bb1d41
am: 6393105afb
Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions