From: Shawn Willden <swillden@google.com>
Date: Fri, 27 Feb 2015 00:51:42 +0000 (+0000)
Subject: am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1... 
X-Git-Tag: android-x86-6.0-r1~121
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a6417d165861bd93fa1d07410c61995024a0e04;p=android-x86%2Fhardware-libhardware.git

am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '55eb5b0caf1eff3f50b7e8f86b7ff24a978be044':
  Separate keymaster0 and keymaster1 HALs.
---

3a6417d165861bd93fa1d07410c61995024a0e04