tree ceceef73cb7e45c3514f372d5603f99b3bcf25bc
parent 3ce31a5b30c78a0ec2739889be6e8655e9568833
parent 1458007d0f8623d649e40c671ad0ec51f4913c79
author Shawn Willden <swillden@google.com> 1424993464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993464 +0000

am 1458007d: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '1458007d0f8623d649e40c671ad0ec51f4913c79':
  Separate keymaster0 and keymaster1 HALs.