Merge "Separate keymaster0 and keymaster1 HALs."
authorShawn Willden <swillden@google.com>
Thu, 26 Feb 2015 23:25:19 +0000 (23:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 26 Feb 2015 23:25:19 +0000 (23:25 +0000)

Trivial merge