tree 17750f1667e3760cdfdf690f32e62f38f0a2a29e
parent 6926a9fe315b61097494b32f7e98edc8a8a58525
parent b8eba478d096712b7fa81ba8c2c70f002372d5b5
author Kenny Root <kroot@android.com> 1363030077 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030077 -0700

am b8eba478: am 25b8e1d3: Merge "Add support for ECDH KeyAgreement to OpenSSLProvider."

* commit 'b8eba478d096712b7fa81ba8c2c70f002372d5b5':
  Add support for ECDH KeyAgreement to OpenSSLProvider.