OSDN Git Service

am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC...
authorAlex Klyubin <klyubin@google.com>
Thu, 9 Apr 2015 20:24:22 +0000 (20:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Apr 2015 20:24:22 +0000 (20:24 +0000)
commitc6112eb7057f91df1f885da37564f89a423f64e4
tree44a5b1c22e4d09181050d5f34516ea2df0d2ba8c
parente24d36b7b744540ccd3401609248ed9d48be4cc9
parent21c4e465f6a4783a9356bf1d88bda42192af022f
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.