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