tree 4d631dcd878bf0b522dce97cd7e9bba45eba6836
parent fec85b39cc9fa2cb9930c993f36ef0d9aa2f1e7a
parent 6de95c93967231c8fce32d7fbfb04621b15863ee
author Kenny Root <kroot@google.com> 1362677718 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362677718 +0000

am 6de95c93: am e25247b8: Merge "NativeCrypto: add OpenSSL X.509 certificate/CRLs"

* commit '6de95c93967231c8fce32d7fbfb04621b15863ee':
  NativeCrypto: add OpenSSL X.509 certificate/CRLs