OSDN Git Service

Merge "Add keymaster2 HAL."
authorShawn Willden <swillden@google.com>
Mon, 25 Jan 2016 17:37:07 +0000 (17:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jan 2016 17:37:07 +0000 (17:37 +0000)
commit7b4766882d1a11a4b87570e7f0b83c5116a64f07
tree5cb9cda7fa01c9b36036e40d7b5756b048a3ad1f
parent432245ec7f116a5587cb83b38248119fecc370e2
parent0c5612db385d359a7caef385fd1815aad2de7a46
Merge "Add keymaster2 HAL."
am: 0c5612db38

* commit '0c5612db385d359a7caef385fd1815aad2de7a46':
  Add keymaster2 HAL.