tree 63e6a9896734bb27231a51906bdf8197c699642f
parent 9408959144d72d72afe89c3cf3de3d3d556a58b5
parent b068ae143df2c2f3030da23d7fc130f735975867
author Alex Klyubin <klyubin@google.com> 1429907726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429907726 +0000

am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."

* commit 'b068ae143df2c2f3030da23d7fc130f735975867':
  No runtime exceptions during normal use of AndroidKeyStore crypto.