diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-16 17:07:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 17:07:51 +0000 |
| commit | f39aa3d0898b845ced3128f1778fd04171e4b9a6 (patch) | |
| tree | 6468d5fdd7641a6dd42656f650d51d1cc45b977c /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 22b5d9b969176a196b0b29ce9441ac3d1d35d208 (diff) | |
| parent | a2607ee4ebef49f88b5656e2eca2db362b32c70d (diff) | |
am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit 'a2607ee4ebef49f88b5656e2eca2db362b32c70d':
Add IV-related Keymaster error codes.
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions