OSDN Git Service

Merge "Add keymaster2 HAL." am: 0c5612db38
authorShawn Willden <swillden@google.com>
Mon, 25 Jan 2016 17:40:10 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jan 2016 17:40:10 +0000 (17:40 +0000)
am: 7b4766882d

* commit '7b4766882d1a11a4b87570e7f0b83c5116a64f07':
  Add keymaster2 HAL.

1  2 
include/hardware/keymaster_defs.h

Simple merge