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