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)
commit1227f460cee2745a790b42611aee4dce82d2d4d6
treed3dcd523ee2931bf67190e11501cd96589211dfb
parent726d830ad845511f0f378d80bce5ac4ee79fff74
parent7b4766882d1a11a4b87570e7f0b83c5116a64f07
Merge "Add keymaster2 HAL." am: 0c5612db38
am: 7b4766882d

* commit '7b4766882d1a11a4b87570e7f0b83c5116a64f07':
  Add keymaster2 HAL.
include/hardware/keymaster_defs.h