tree beaa183a76df4ba0d7f94346d91f768a3c7bfde6
parent 93b3d6658762a84b23cd3421d0f41e4d82693cc3
parent 957e982cd5fdbf45817500abf68fe8a0689adc34
author Alex Klyubin <klyubin@google.com> 1428007985 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428007985 +0000

am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."

* commit '957e982cd5fdbf45817500abf68fe8a0689adc34':
  Add exception types for AndroidKeyStore key validity issues.