tree ae37a0affa1a26bc97a5d19b4905c9c4a71a5e72
parent 39ddcd72efff85b5480700fe2e704be3e08c9b6c
parent c9ea3e425452819f6be82da22d58211bf04fac10
author Shawn Willden <swillden@google.com> 1424993464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993464 +0000

am c9ea3e42: Merge "Separate keymaster0 and keymaster1 HALs."

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