diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-02-08 11:11:18 -0800 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-02-17 08:39:59 -0800 |
| commit | 337095f9d277c566cb888bc3adbac16576f1ae70 (patch) | |
| tree | 8818a5cd44fdfa89f7ef4d8570dbc67239e087dd /keystore/java/android/security/KeyStore.java | |
| parent | 80b7ed3f7373212a33fe42af8a7b7fc0ebcb187c (diff) | |
| parent | a66768631e6f47e1f7ffcf4ec86f96d6e8f35282 (diff) | |
Merge SP1A.210208.001
Change-Id: I7d4929024872b369444e276a60ded06e37b1fefb
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 4a67135227dd..e19d88c182ff 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -45,8 +45,8 @@ import android.security.keystore.KeystoreResponse; import android.security.keystore.UserNotAuthenticatedException; import android.util.Log; -import com.android.org.bouncycastle.asn1.ASN1InputStream; -import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; +import com.android.internal.org.bouncycastle.asn1.ASN1InputStream; +import com.android.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import java.io.ByteArrayInputStream; import java.io.IOException; |