diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-11 13:24:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-11 13:24:22 +0000 |
| commit | 25104e1f08f322545e5f7c078087336ea20a7498 (patch) | |
| tree | 4252ad1afb435206b2c1063c24f9a178c265d86b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d8aad5ac388340512a628bb5820d45afa6709ee5 (diff) | |
| parent | 1a70ce6220c922da7c39714223003e87442e1fd5 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am: d23be95dd7 -s ours am: eed04347e7
am: 1a70ce6220
Change-Id: I57a942589fbc00ad588eb8ba7176cbd89cb8174a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions