drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

Browse Source 
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
This commit is contained in:
Kenny Root
2013-04-29 23:09:03 -07:00
parent be53f1806c 1f6e789b7e
commit e9ae6822a8
19 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyChain.java
View File

@ -37,8 +37,8 @@ import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine;
import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
import com.android.org.conscrypt.OpenSSLEngine;
import com.android.org.conscrypt.TrustedCertificateStore;
/**
* The {@code KeyChain} class provides access to private keys and