tree 4e0072a7ee5cc9bb1ef0e59e657a0953c12a1481
parent a22125ff98085c0fe662966cadfe4c889707db54
parent c1c6528d2b686d5a17e577e7864a319dcba7c224
author Alex Klyubin <klyubin@google.com> 1428719745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428719745 +0000

am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto."

* commit 'c1c6528d2b686d5a17e577e7864a319dcba7c224':
  Add EcIesParameterSpec to enable ECIES crypto.