tree 7daa372743d18b1cec3f03090a6d83c24b7f62fd
parent 297e586c29489b5d43cddd9d9e4349f36f47166b
parent 3aa7935ef24946c1aa6db6c04fea10f39453c450
author Shawn Willden <swillden@google.com> 1448296251 +0000
committer android-build-merger <android-build-merger@google.com> 1448296251 +0000

Merge "ECIES: adding ECIES-KEM"
am: 3aa7935ef2

* commit '3aa7935ef24946c1aa6db6c04fea10f39453c450':
  ECIES: adding ECIES-KEM