tree b0854a2d929d05efa7ed9d912846caa49cef0f24
parent 51db02446c690880784ee591b0b1b55bb43fe912
parent aa880c9122912cc34a2969af9afc48816f87084e
author Alex Klyubin <klyubin@google.com> 1433453419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433453419 +0000

am aa880c91: am b070e486: Merge "Reliably delete keys if key generation fails." into mnc-dev

* commit 'aa880c9122912cc34a2969af9afc48816f87084e':
  Reliably delete keys if key generation fails.