tree 6468d5fdd7641a6dd42656f650d51d1cc45b977c
parent 22b5d9b969176a196b0b29ce9441ac3d1d35d208
parent a2607ee4ebef49f88b5656e2eca2db362b32c70d
author Alex Klyubin <klyubin@google.com> 1429204071 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429204071 +0000

am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."

* commit 'a2607ee4ebef49f88b5656e2eca2db362b32c70d':
  Add IV-related Keymaster error codes.