From d76bc2248e1c9db2496aac51cb48de9ed8af8a80 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 23 Apr 2013 22:38:23 -0700
Subject: [PATCH] Track change to JSSE provider

Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
---
 Android.mk                                               | 2 +-
 src/com/android/settings/TrustedCredentialsSettings.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index fe8ed2d4909..bdc5f8b3ae9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4 jsr305
 
 LOCAL_MODULE_TAGS := optional
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 687663a911e..cdfe7cd303a 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 {