| commit | 8ad875f52de3ffa99fea22177e26a7f22c3735b1 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Apr 08 22:03:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 08 22:03:47 2015 +0000 |
| tree | 072ddf04c416b4514271c0c417628274eac9a71e | |
| parent | 163e501609c8f17c1ab20b78c3d5d6691abc2bc2 [diff] | |
| parent | 0649c832b8285d1b07c6e07362dbfe3ca0535609 [diff] |
am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." * commit '0649c832b8285d1b07c6e07362dbfe3ca0535609': Add BlockMode.GCM constant to AndroidKeyStore API.