diff options
author | Alex Klyubin <klyubin@google.com> | 2015-04-09 20:34:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 20:34:46 +0000 |
commit | 27077471a309e3bdb35521435872bc2a2b483411 (patch) | |
tree | a8447e874c862d5fdece779b7d8bdd083eedbdba /keystore/java/android/security/KeyStoreKeySpec.java | |
parent | f4ab2b1074cceeaa762e611e04fa59e1e7dee171 (diff) | |
parent | c6112eb7057f91df1f885da37564f89a423f64e4 (diff) | |
download | frameworks_base-27077471a309e3bdb35521435872bc2a2b483411.zip frameworks_base-27077471a309e3bdb35521435872bc2a2b483411.tar.gz frameworks_base-27077471a309e3bdb35521435872bc2a2b483411.tar.bz2 |
am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit 'c6112eb7057f91df1f885da37564f89a423f64e4':
Add missing mapping between JCA and keystore HMAC names.
Diffstat (limited to 'keystore/java/android/security/KeyStoreKeySpec.java')
0 files changed, 0 insertions, 0 deletions