OSDN Git Service

Merge "ECIES: adding ECIES-KEM" am: 3aa7935ef2 am: 7adb2d457c
authorShawn Willden <swillden@google.com>
Mon, 23 Nov 2015 16:36:47 +0000 (16:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Nov 2015 16:36:47 +0000 (16:36 +0000)
am: 2eef78d355

* commit '2eef78d355c62f3e1b5ec626a080a7e3f91257c9':
  ECIES: adding ECIES-KEM

1  2 
include/hardware/keymaster_defs.h

Simple merge