| commit | c6112eb7057f91df1f885da37564f89a423f64e4 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 09 20:24:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 20:24:22 2015 +0000 |
| tree | 44a5b1c22e4d09181050d5f34516ea2df0d2ba8c | |
| parent | e24d36b7b744540ccd3401609248ed9d48be4cc9 [diff] | |
| parent | 21c4e465f6a4783a9356bf1d88bda42192af022f [diff] |
am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names." * commit '21c4e465f6a4783a9356bf1d88bda42192af022f': Add missing mapping between JCA and keystore HMAC names.