PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 64914364: resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp

Browse Source 
* commit '649143648073116b2ffb6af412b41ecec5280f86':
  Track change to JSSE provider
This commit is contained in:
Kenny Root
2013-04-30 09:01:44 -07:00
committed by Android Git Automerger
parent 40ec92c4e0 6491436480
commit 3d9918c2e2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -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 {