OSDN Git Service

am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
authorAlex Klyubin <klyubin@google.com>
Wed, 8 Apr 2015 21:37:04 +0000 (21:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Apr 2015 21:37:04 +0000 (21:37 +0000)
commit0649c832b8285d1b07c6e07362dbfe3ca0535609
treee9bd91efd8f18dfab18b7e86a0e2d1709cc236c4
parentff5e9554cf0a1a2eaf2e353698b91400a3c57f17
parent3283d2d208c0686fa964008e1520179948886adb
am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."

* commit '3283d2d208c0686fa964008e1520179948886adb':
  Add BlockMode.GCM constant to AndroidKeyStore API.