diff options
| author | Kenny Root <kroot@google.com> | 2013-04-23 22:38:23 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 10:43:00 -0700 |
| commit | d76bc2248e1c9db2496aac51cb48de9ed8af8a80 (patch) | |
| tree | f428a8aa2380b5a65da9a7618dbcce166b75d612 /src/com/android/settings/TrustedCredentialsSettings.java | |
| parent | c814271fe4117a6c94a314a349edd8d7222cf2c0 (diff) | |
| download | packages_apps_Settings-d76bc2248e1c9db2496aac51cb48de9ed8af8a80.zip packages_apps_Settings-d76bc2248e1c9db2496aac51cb48de9ed8af8a80.tar.gz packages_apps_Settings-d76bc2248e1c9db2496aac51cb48de9ed8af8a80.tar.bz2 | |
Track change to JSSE provider
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
Diffstat (limited to 'src/com/android/settings/TrustedCredentialsSettings.java')
| -rw-r--r-- | src/com/android/settings/TrustedCredentialsSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 687663a..cdfe7cd 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -45,7 +45,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore; + +import com.android.org.conscrypt.TrustedCertificateStore; public class TrustedCredentialsSettings extends Fragment { |