am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev

* commit '084a11612dd1b1958f4421315e3929657723f7c9': Revert "Update Trusted Credentials screen in settings"
2014-08-07 13:53:10 +00:00
parent bdbd4a55ef 2fe77f5393
commit 5576e855bf
4 changed files with 29 additions and 42 deletions
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -468,8 +468,7 @@ public final class KeyChain {
        return KeyStore.getInstance().isHardwareBacked(algorithm);
    }

-    /** @hide */
-    public static X509Certificate toCertificate(byte[] bytes) {
+    private static X509Certificate toCertificate(byte[] bytes) {
        if (bytes == null) {
            throw new IllegalArgumentException("bytes == null");
        }