tree 0bc91df784eacb96d6ec664a8e81741d157953a3
parent c7b3ba5e29241b9705939135104cdf9d6c8d6180
parent 3b69cbe7707eaab58032168fc7e5cca246618a99
author Kenny Root <kroot@android.com> 1363735792 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363735792 -0700

am 3b69cbe7: Merge "Make ECDH KeyAgreement reject AlgorithmParameterSpec."

* commit '3b69cbe7707eaab58032168fc7e5cca246618a99':
  Make ECDH KeyAgreement reject AlgorithmParameterSpec.