tree 79e0d0506ef4790c8107589835a7d4f5caa5089c
parent 50af640d5ff50381fdc03153c07f8881219ee033
parent fb378aecff0b635f72614e5b0f8cca36271051d1
author Shawn Willden <swillden@google.com> 1424994938 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424994938 +0000

am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."

* commit 'fb378aecff0b635f72614e5b0f8cca36271051d1':
  Separate keymaster0 and keymaster1 HALs.