OSDN Git Service

am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
authorShawn Willden <swillden@google.com>
Thu, 26 Feb 2015 23:31:14 +0000 (23:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Feb 2015 23:31:14 +0000 (23:31 +0000)
* commit '17dde875dda1b96722e6fb07850c268ca716c3d1':
  Separate keymaster0 and keymaster1 HALs.


Trivial merge