diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2018-11-15 17:26:33 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-15 17:26:33 -0800 |
| commit | 8585e6b7605bf89f6863a8acb77a60971d26d2c0 (patch) | |
| tree | 7a6af17305103974d58f93adfbb8c9a27d438981 /keystore/java/android/security/KeyStore.java | |
| parent | ceebc76cb2a855bb7545f3824a6ba18ed34a925c (diff) | |
| parent | 95a00c44963ee6dd07a897457a7fe3c7c9a5b140 (diff) | |
Merge "Handle SSL errors in CaptivePortalLoginActivity" am: c6c06b004e
am: 95a00c4496
Change-Id: Iff43645aaabd481d778a07978e4eb04c6c50d53c
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions