OSDN Git Service

am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
authorShawn Willden <swillden@google.com>
Fri, 27 Feb 2015 00:43:17 +0000 (00:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 00:43:17 +0000 (00:43 +0000)
* commit 'e05ffdbb306d5e5b615a7e7a65c665010211b9b6':
  Separate keymaster0 and keymaster1 HALs.


Trivial merge