| commit | 27077471a309e3bdb35521435872bc2a2b483411 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 09 20:34:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 20:34:46 2015 +0000 |
| tree | a8447e874c862d5fdece779b7d8bdd083eedbdba | |
| parent | f4ab2b1074cceeaa762e611e04fa59e1e7dee171 [diff] | |
| parent | c6112eb7057f91df1f885da37564f89a423f64e4 [diff] |
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.