| commit | 0649c832b8285d1b07c6e07362dbfe3ca0535609 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Apr 08 21:37:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 08 21:37:04 2015 +0000 |
| tree | e9bd91efd8f18dfab18b7e86a0e2d1709cc236c4 | |
| parent | ff5e9554cf0a1a2eaf2e353698b91400a3c57f17 [diff] | |
| parent | 3283d2d208c0686fa964008e1520179948886adb [diff] |
am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." * commit '3283d2d208c0686fa964008e1520179948886adb': Add BlockMode.GCM constant to AndroidKeyStore API.