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


Trivial merge