tree 2bcbf3e13525d0f84a6bb1b3abab80e2df853b03
parent 70fb8092d781fa58f17ef889239e36e8f0ff9c36
parent c4426215e9fd7821cd1f2aa95cce5de5fb3dda06
author Kenny Root <kroot@google.com> 1362782673 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362782673 -0800

am c4426215: am 21e34921: Merge changes I8475e328,Ie0e35777

* commit 'c4426215e9fd7821cd1f2aa95cce5de5fb3dda06':
  NativeCrypto: add CertPath encoding PkiPath
  NativeCrypto: add CertPath support with PKCS7