OSDN Git Service

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


Trivial merge