tree 3f355a0cef38b663007996681eaf9f353f89df55
parent 19ccb3a62a6024de0cfd984a97a85a51a45f028b
parent 085d3b5fdbb1d02607ee107581c22c090082db65
author Kenny Root <kroot@google.com> 1380134730 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380134730 -0700

am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"

* commit '085d3b5fdbb1d02607ee107581c22c090082db65':
  Read algorithm OID directly from PKCS#8 container